diff options
Diffstat (limited to 'tikzit/src/gtk')
-rw-r--r-- | tikzit/src/gtk/TikzDocument.h | 1 | ||||
-rw-r--r-- | tikzit/src/gtk/TikzDocument.m | 43 | ||||
-rw-r--r-- | tikzit/src/gtk/main.m | 1 |
3 files changed, 7 insertions, 38 deletions
diff --git a/tikzit/src/gtk/TikzDocument.h b/tikzit/src/gtk/TikzDocument.h index da73fac..2b55f05 100644 --- a/tikzit/src/gtk/TikzDocument.h +++ b/tikzit/src/gtk/TikzDocument.h @@ -70,7 +70,6 @@ @property (readonly) NSString *undoName; @property (readonly) NSString *redoName; -- (BOOL) validateTikz:(NSString**)tikz error:(NSError**)error; - (BOOL) updateTikz:(NSString*)t error:(NSError**)error; - (Graph*) cutSelection; diff --git a/tikzit/src/gtk/TikzDocument.m b/tikzit/src/gtk/TikzDocument.m index 30d604a..78746f2 100644 --- a/tikzit/src/gtk/TikzDocument.m +++ b/tikzit/src/gtk/TikzDocument.m @@ -256,26 +256,6 @@ return tikz; } -- (BOOL) validateTikz:(NSString**)t error:(NSError**)error { - if (*t == nil) { - return NO; - } - if (*t == tikz || [*t isEqual:tikz]) { - return YES; - } - - TikzGraphAssembler *a = [TikzGraphAssembler assembler]; - BOOL success = [a parseTikz:*t]; - if (!success && error != NULL) { - *error = [a lastError]; - if (*error == nil) { - *error = [NSError errorWithMessage:@"Unknown error" - code:TZ_ERR_PARSE]; - } - } - return success; -} - - (BOOL) updateTikz:(NSString*)t error:(NSError**)error { if (t == nil) { t = [NSString string]; @@ -284,25 +264,17 @@ return YES; } - TikzGraphAssembler *a = [TikzGraphAssembler assembler]; - BOOL success = [a parseTikz:t]; - if (success) { + Graph *g = [TikzGraphAssembler parseTikz:t error:error]; + if (g) { // updateTikz actually generates a graph from the tikz, // and generates the final tikz from that [self startUndoGroup]; - [self setGraph:[a graph]]; + [self setGraph:g]; [self nameAndEndUndoGroup:@"Update tikz"]; - } else { - if (error != NULL) { - *error = [a lastError]; - if (*error == nil) { - *error = [NSError errorWithMessage:@"Unknown error" - code:TZ_ERR_PARSE]; - } - } + return YES; } - return success; + return NO; } - (Graph*) cutSelection { @@ -338,9 +310,8 @@ } - (void) pasteFromTikz:(NSString*)t { - TikzGraphAssembler *a = [TikzGraphAssembler assembler]; - if ([a parseTikz:t]) { - Graph *clipboard = [a graph]; + Graph *clipboard = [TikzGraphAssembler parseTikz:t]; + if (clipboard) { [self attachStylesToGraph:clipboard]; [self paste:clipboard]; } diff --git a/tikzit/src/gtk/main.m b/tikzit/src/gtk/main.m index eb06449..10fa990 100644 --- a/tikzit/src/gtk/main.m +++ b/tikzit/src/gtk/main.m @@ -81,7 +81,6 @@ int main (int argc, char *argv[]) { tz_register_stock_items(); clipboard_init(); - [TikzGraphAssembler setup]; Application *app = nil; if (argc > 1) { |