fixed many warnings

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<Node*> nds, bool horizontal)
 

 void Graph::rotateNodes(QSet<Node*> 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; }
 &lt;/style&gt;&lt;/head&gt;&lt;body style=&quot; font-family:'Courier New'; font-size:10pt; font-weight:400; font-style:normal;&quot;&gt;
 &lt;p style=&quot;-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;&quot;&gt;&lt;br /&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
        </property>
-       <property name="tabStopWidth">
-        <number>20</number>
+       <property name="tabStopDistance">
+        <double>20.000000000000000</double>
        </property>
       </widget>
      </widget>
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<Node*,QString> 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<Node *, QString> oldLabels, QString newLabel, QUndoCommand *parent) :
+ChangeLabelCommand::ChangeLabelCommand(TikzScene *scene, QMap<Node *, QString> 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<Node*,QString> oldLabels,
                                 QString newLabel,
                                 QUndoCommand *parent = 0);
     void undo() override;
     void redo() override;
 private:
-    Graph *_graph;
     QMap<Node*,QString> _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<MainWindow*> _windows;
-    MainWindow *_activeWindow;
     TikzStyles *_styles;
     QString _styleFile;
     QString _styleFilePath;
+    QVector<MainWindow*> _windows;
+    MainWindow *_activeWindow;
     StyleEditor *_styleEditor;
     QStringList _colNames;
     QVector<QColor> _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 <stdio.h>

-#include <string.h>

-#include <errno.h>

-#include <stdlib.h>

-

-/* end standard C headers. */

-

-/* flex integer type definitions */

-

-#ifndef FLEXINT_H

-#define FLEXINT_H

-

-/* C99 systems have <inttypes.h>. 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 <inttypes.h>

-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 <unistd.h>

-#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 <stdio.h>
+#include <string.h>
+#include <errno.h>
+#include <stdlib.h>
+
+/* end standard C headers. */
+
+/* flex integer type definitions */
+
+#ifndef FLEXINT_H
+#define FLEXINT_H
+
+/* C99 systems have <inttypes.h>. 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 <inttypes.h>
+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 <unistd.h>
+#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 */