diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 29 | ||||
| -rw-r--r-- | debian/clean | 7 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rw-r--r-- | debian/control | 30 | ||||
| -rw-r--r-- | debian/copyright | 218 | ||||
| -rw-r--r-- | debian/patches/0001-Allow-empty-square-brackets-for-properties-list.patch | 27 | ||||
| -rw-r--r-- | debian/patches/0002-Do-not-reverse-the-order-of-the-properties-when-pars.patch | 39 | ||||
| -rw-r--r-- | debian/patches/0003-Use-flex-and-bison-options-instead-of-defines.patch | 100 | ||||
| -rw-r--r-- | debian/patches/0004-Tidy-up-and-document-bison-decls-in-tikzparser.ym.patch | 98 | ||||
| -rw-r--r-- | debian/patches/series | 4 | ||||
| -rwxr-xr-x | debian/rules | 12 | ||||
| -rw-r--r-- | debian/source/format | 1 |
12 files changed, 566 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..5723c33 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,29 @@ +tikzit (1.0+ds-4) UNRELEASED; urgency=medium + + * d/changelog: Remove trailing whitespaces + + -- Ondřej Nový <onovy@debian.org> Mon, 01 Oct 2018 09:51:08 +0200 + +tikzit (1.0+ds-3) unstable; urgency=medium + + * Build-depend on libgnustep-base-dev instead of libgnustep-gui-dev + (Closes: #883544). + * Correct libgnustep-base-dev dependency version per upstream. + * Bump standards-version to 4.1.3. No changes needed. + + -- Gard Spreemann <gspreemann@gmail.com> Mon, 08 Jan 2018 14:05:45 +0100 + +tikzit (1.0+ds-2) unstable; urgency=medium + + * Recommend preview-latex-style. Needed for previews. + * Bump standards-version to 4.1.1. No changes needed. + * Remove dh-autoreconf build-dep (no needed since dh 10). + + -- Gard Spreemann <gspreemann@gmail.com> Thu, 09 Nov 2017 16:34:27 +0100 + +tikzit (1.0+ds-1) unstable; urgency=medium + + * Initial release (Closes: #852376) + + -- Gard Spreemann <gspreemann@gmail.com> Tue, 24 Jan 2017 01:49:49 +0100 + diff --git a/debian/clean b/debian/clean new file mode 100644 index 0000000..4d08138 --- /dev/null +++ b/debian/clean @@ -0,0 +1,7 @@ +tikzit/src/common/tikzlexer.h +tikzit/src/common/tikzlexer.m +tikzit/src/common/tikzparser.h +tikzit/src/common/tikzparser.m +tikzit/src/gtk/edgedecdata.m +tikzit/src/gtk/icondata.m +tikzit/src/gtk/logodata.m diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..b4de394 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +11 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..74a2a42 --- /dev/null +++ b/debian/control @@ -0,0 +1,30 @@ +Source: tikzit +Section: tex +Priority: optional +Maintainer: Gard Spreemann <gspreemann@gmail.com> +Build-Depends: + autoconf (>= 2.60), + automake, + bison, + debhelper (>= 11), + flex, + gobjc (>= 4.6), + libgnustep-base-dev (>= 1.18.0), + libgtk2.0-dev (>= 2.18.0), + libpoppler-glib-dev +Standards-Version: 4.1.5 +Homepage: https://tikzit.github.io/ +Vcs-Browser: https://salsa.debian.org/debian/tikzit +Vcs-Git: https://salsa.debian.org/debian/tikzit.git + +Package: tikzit +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Recommends: preview-latex-style, texlive-pictures +Description: visual PGF/TikZ graph editor + TikZiT is a graphical tool for editing graphs written in PGF/TikZ. + . + TikZiT helps rapidly create and edit 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. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..9883b8c --- /dev/null +++ b/debian/copyright @@ -0,0 +1,218 @@ +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: tikzit +Source: http://tikzit.sourceforge.net/ + +Files: * +Copyright: 2010-2017 Aleks Kissinger <aleks0@gmail.com> + 2010-2017 Alex Merry <dev@randomguy3.me.uk> + 2010-2017 Johan Paulsson <gonz@badcode.net> + 2010-2017 Chris Heunen +License: GPL-3+ + +Files: tikzit/src/gtk/tztoolpalette.* +Copyright: 2010 Michael Natterer <mitch@gimp.org> +License: GPL-3+ + +Files: tikzit/src/gtk/gtkhelpers.* +Copyright: 2001 Ximian, Inc. + 2010 Aleks Kissinger <aleks0@gmail.com> +License: GPL-3+ + +Files: tikzit/src/gtk/Menu.* +Copyright: 2001 Ximian, Inc. + 2007 Vincent Geddes + 2011 Aleks Kissinger <aleks0@gmail.com> +License: GPL-2+ + +Files: tikzit/src/common/Grid.* tikzit/src/gtk/GraphRenderer.m +Copyright: 2010 Chris Heunen + 2011 Alex Merry <dev@randomguy3.me.uk> +License: GPL-2+ + +Files: tikzit/src/common/NSError+Tikzit.* tikzit/src/common/RColor.* + tikzit/src/common/StyleManager.* + tikzit/src/common/TikzGraphAssembler+Parser.h +Copyright: 2011 Alex Merry <dev@randomguy3.me.uk> +License: GPL-2+ + +Files: tikzit/src/common/NSString+* +Copyright: 2010-2013 Alex Merry <dev@randomguy3.me.uk> +License: GPL-2+ + +Files: tikzit/src/common/tikzlexer.lm tikzit/src/common/tikzparser.ym +Copyright: 2010 Chris Heunen + 2010-2013 Aleks Kissinger <aleks0@gmail.com> + 2013 K. Johan Paulsson + 2013 Alex Merry <dev@randomguy3.me.uk> +License: GPL-2+ + +Files: tikzit/src/osx/CoreGraphicsRenderContext.* +Copyright: 2011 Alex Merry <dev@randomguy3.me.uk> +License: GPL-2+ + +Files: tikzit/src/gtk/Application.h + tikzit/src/gtk/Application.m + tikzit/src/gtk/ColorRGB+Gtk.h + tikzit/src/gtk/ColorRGB+IntegerListStorage.h + tikzit/src/gtk/ContextWindow.h + tikzit/src/gtk/ContextWindow.m + tikzit/src/gtk/Edge+Render.h + tikzit/src/gtk/EdgeStyle+Gtk.h + tikzit/src/gtk/EdgeStyle+Gtk.m + tikzit/src/gtk/EdgeStyle+Storage.h + tikzit/src/gtk/EdgeStyle+Storage.m + tikzit/src/gtk/EdgeStyleEditor.h + tikzit/src/gtk/EdgeStyleEditor.m + tikzit/src/gtk/EdgeStyleSelector.h + tikzit/src/gtk/EdgeStyleSelector.m + tikzit/src/gtk/EdgeStylesModel.h + tikzit/src/gtk/EdgeStylesModel.m + tikzit/src/gtk/EdgeStylesPalette.h + tikzit/src/gtk/EdgeStylesPalette.m + tikzit/src/gtk/GraphRenderer.h + tikzit/src/gtk/Node+Render.h + tikzit/src/gtk/NodeStyle+Gtk.h + tikzit/src/gtk/NodeStyle+Gtk.m + tikzit/src/gtk/NodeStyle+Render.h + tikzit/src/gtk/NodeStyle+Storage.h + tikzit/src/gtk/NodeStyleEditor.h + tikzit/src/gtk/NodeStyleEditor.m + tikzit/src/gtk/NodeStyleSelector.h + tikzit/src/gtk/NodeStyleSelector.m + tikzit/src/gtk/NodeStylesModel.h + tikzit/src/gtk/NodeStylesModel.m + tikzit/src/gtk/NodeStylesPalette.h + tikzit/src/gtk/NodeStylesPalette.m + tikzit/src/gtk/PreambleEditor.h + tikzit/src/gtk/PreambleEditor.m + tikzit/src/gtk/Preambles+Storage.h + tikzit/src/gtk/Preambles+Storage.m + tikzit/src/gtk/PreviewRenderer.h + tikzit/src/gtk/PreviewRenderer.m + tikzit/src/gtk/PreviewWindow.h + tikzit/src/gtk/PreviewWindow.m + tikzit/src/gtk/PropertiesPane.h + tikzit/src/gtk/PropertiesPane.m + tikzit/src/gtk/PropertyListEditor.h + tikzit/src/gtk/PropertyListEditor.m + tikzit/src/gtk/SelectionPane.h + tikzit/src/gtk/SelectionPane.m + tikzit/src/gtk/SettingsDialog.h + tikzit/src/gtk/SettingsDialog.m + tikzit/src/gtk/Shape+Render.h + tikzit/src/gtk/Shape+Render.m + tikzit/src/gtk/StyleManager+Storage.h + tikzit/src/gtk/StyleManager+Storage.m + tikzit/src/gtk/Surface.h + tikzit/src/gtk/ToolBox.h + tikzit/src/gtk/ToolBox.m + tikzit/src/gtk/WidgetSurface.h + tikzit/src/gtk/WidgetSurface.m + tikzit/src/gtk/Window.h + tikzit/src/gtk/Window.m + tikzit/src/gtk/clipboard.h + tikzit/src/gtk/clipboard.m + tikzit/src/gtk/tzstockitems.h + tikzit/src/gtk/tzstockitems.m + tikzit/src/gtk/BoundingBoxTool.h + tikzit/src/gtk/BoundingBoxTool.m + tikzit/src/gtk/CairoRenderContext.h + tikzit/src/gtk/CairoRenderContext.m + tikzit/src/gtk/CreateEdgeTool.h + tikzit/src/gtk/CreateEdgeTool.m + tikzit/src/gtk/CreateNodeTool.h + tikzit/src/gtk/CreateNodeTool.m + tikzit/src/gtk/DocumentContext.h + tikzit/src/gtk/FileChooserDialog.h + tikzit/src/gtk/FileChooserDialog.m + tikzit/src/gtk/GraphEditorPanel.h + tikzit/src/gtk/GraphEditorPanel.m + tikzit/src/gtk/HandTool.h + tikzit/src/gtk/HandTool.m + tikzit/src/gtk/InputDelegate.h + tikzit/src/gtk/Menu.h + tikzit/src/gtk/NSError+Glib.h + tikzit/src/gtk/NSError+Glib.m + tikzit/src/gtk/NSFileManager+Glib.h + tikzit/src/gtk/NSFileManager+Glib.m + tikzit/src/gtk/NSString+Glib.h + tikzit/src/gtk/NSString+Glib.m + tikzit/src/gtk/RecentManager.h + tikzit/src/gtk/RecentManager.m + tikzit/src/gtk/SelectTool.h + tikzit/src/gtk/SelectTool.m + tikzit/src/gtk/TZFoundation.h + tikzit/src/gtk/Tool.h + tikzit/src/gtk/cairo_helpers.h + tikzit/src/gtk/cairo_helpers.m + tikzit/src/gtk/logo.h + tikzit/src/gtk/logo.m + tikzit/src/gtk/ColorRGB+Gtk.m + tikzit/src/gtk/ColorRGB+IntegerListStorage.m + tikzit/src/gtk/Edge+Render.m + tikzit/src/gtk/Node+Render.m + tikzit/src/gtk/NodeStyle+Storage.m +Copyright: 2011-2013 Alex Merry <dev@randomguy3.me.uk> +License: GPL-2+ + +Files: tikzit/src/gtk/mkdtemp.* +Copyright: 1999, 2001-2003, Free Software Foundation, Inc. +License: LGPL-2+ + +Files: debian/* +Copyright: 2017 Gard Spreemann <gspreemann@gmail.com> +License: GPL-3+ + +License: GPL-3+ + This program is free software: you can redistribute it and/or modify + it under the terms of the 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 <http://www.gnu.org/licenses/>. + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". + +License: GPL-2+ + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program. If not, see <http://www.gnu.org/licenses/>. + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". + +License: LGPL-2+ + 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 <http://www.gnu.org/licenses/>. + . + On Debian systems, the complete text of the GNU Library General + Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
\ No newline at end of file diff --git a/debian/patches/0001-Allow-empty-square-brackets-for-properties-list.patch b/debian/patches/0001-Allow-empty-square-brackets-for-properties-list.patch new file mode 100644 index 0000000..b37b9d2 --- /dev/null +++ b/debian/patches/0001-Allow-empty-square-brackets-for-properties-list.patch @@ -0,0 +1,27 @@ +From 84df4540333450f9520c58b847bf5c5a54435321 Mon Sep 17 00:00:00 2001 +From: Alex Merry <dev@randomguy3.me.uk> +Date: Mon, 29 Jul 2013 16:11:59 +0100 +Subject: [PATCH 1/4] 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 +-- +2.11.0 + diff --git a/debian/patches/0002-Do-not-reverse-the-order-of-the-properties-when-pars.patch b/debian/patches/0002-Do-not-reverse-the-order-of-the-properties-when-pars.patch new file mode 100644 index 0000000..a5e0ab6 --- /dev/null +++ b/debian/patches/0002-Do-not-reverse-the-order-of-the-properties-when-pars.patch @@ -0,0 +1,39 @@ +From 8de27c4c7c9a42a8224e3dfc865b25b184ce1399 Mon Sep 17 00:00:00 2001 +From: Alex Merry <dev@randomguy3.me.uk> +Date: Mon, 29 Jul 2013 16:12:32 +0100 +Subject: [PATCH 2/4] 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: +-- +2.11.0 + diff --git a/debian/patches/0003-Use-flex-and-bison-options-instead-of-defines.patch b/debian/patches/0003-Use-flex-and-bison-options-instead-of-defines.patch new file mode 100644 index 0000000..bce0ce1 --- /dev/null +++ b/debian/patches/0003-Use-flex-and-bison-options-instead-of-defines.patch @@ -0,0 +1,100 @@ +From 456d1a0aa3699833d6db381d3ceec51e48451c17 Mon Sep 17 00:00:00 2001 +From: Alex Merry <dev@randomguy3.me.uk> +Date: Fri, 2 Aug 2013 20:38:45 +0100 +Subject: [PATCH 3/4] 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]; + } + %} +-- +2.11.0 + diff --git a/debian/patches/0004-Tidy-up-and-document-bison-decls-in-tikzparser.ym.patch b/debian/patches/0004-Tidy-up-and-document-bison-decls-in-tikzparser.ym.patch new file mode 100644 index 0000000..24de718 --- /dev/null +++ b/debian/patches/0004-Tidy-up-and-document-bison-decls-in-tikzparser.ym.patch @@ -0,0 +1,98 @@ +From 279644fb0b99dfb07ceaf713ca610e043131c6f4 Mon Sep 17 00:00:00 2001 +From: Alex Merry <dev@randomguy3.me.uk> +Date: Fri, 2 Aug 2013 21:24:08 +0100 +Subject: [PATCH 4/4] 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 <http://www.gnu.org/licenses/>. + */ +- +-#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 <Foundation/Foundation.h> + @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}" +-- +2.11.0 + diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..e86571f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,4 @@ +0001-Allow-empty-square-brackets-for-properties-list.patch +0002-Do-not-reverse-the-order-of-the-properties-when-pars.patch +0003-Use-flex-and-bison-options-instead-of-defines.patch +0004-Tidy-up-and-document-bison-decls-in-tikzparser.ym.patch diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..955ab1f --- /dev/null +++ b/debian/rules @@ -0,0 +1,12 @@ +#!/usr/bin/make -f + +#export DH_VERBOSE = 1 + +export DEB_BUILD_MAINT_OPTIONS = hardening=+all + +%: + dh $@ --sourcedirectory=tikzit --no-parallel + +override_dh_auto_clean: + find tikzit/src -name "*.d" -exec rm -f {} \; + dh_auto_clean --sourcedirectory=tikzit diff --git a/debian/source/format b/debian/source/format new file mode 100644 index 0000000..163aaf8 --- /dev/null +++ b/debian/source/format @@ -0,0 +1 @@ +3.0 (quilt) |