edge styles 90 percent

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<Node*,Node*> *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 <QObject>
 #include <QPointF>
@@ -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<qreal> 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 <QStyleOptionGraphicsItem>
 #include <QWidget>
 #include <QGraphicsEllipseItem>
+#include <QString>
 
 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<EdgeItem*>(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<Node*,QString> _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<Edge*, QString> _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 <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);
+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 */