relocated source code to the root

author: Aleks Kissinger <aleks0@gmail.com> 2018-01-04 16:00:52 +0100
committer: Aleks Kissinger <aleks0@gmail.com> 2018-01-04 16:00:52 +0100
commit: 738ecbd5fad2b46836bfd6a94aeebf165ae2bbca (patch)
tree: df04709807cc9ec8481a3ebc7d80ac25e5b2f457 /src
parent: 0421a96749743868554d44585050b1b3d04864d2 (diff)
57 files changed, 8999 insertions, 0 deletions
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 <QDebug>
+#include <QPointF>
+
+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 <QObject>
+#include <QPointF>
+
+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 <QTextStream>
+#include <QSet>
+#include <QtAlgorithms>
+#include <QDebug>
+#include <algorithm>
+
+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<Node*> &Graph::nodes()
+{
+    return _nodes;
+}
+
+const QVector<Edge*> &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 <QObject>
+#include <QVector>
+#include <QMultiHash>
+#include <QRectF>
+#include <QString>
+
+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<Node *> &nodes();
+    const QVector<Edge*> &edges();
+
+    QRectF bbox() const;
+    void setBbox(const QRectF &bbox);
+    bool hasBbox();
+    void clearBbox();
+
+    QString tikz();
+signals:
+
+public slots:
+
+private:
+    QVector<Node*> _nodes;
+    QVector<Edge*> _edges;
+    //QMultiHash<Node*,Edge*> inEdges;
+    //QMultiHash<Node*,Edge*> 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 <QDebug>
+#include <QTextStream>
+
+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<GraphElementProperty*>(index.internalPointer());
+    if (p == root) return QModelIndex();
+    else return createIndex(0,0,static_cast<void*>(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 <QAbstractItemModel>
+#include <QString>
+#include <QVariant>
+#include <QModelIndex>
+#include <QVector>
+
+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<GraphElementProperty> _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 <QRegExp>
+
+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 <QObject>
+
+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 <QDebug>
+
+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 <QObject>
+#include <QPointF>
+#include <QString>
+
+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 <QColor>
+
+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 <QFile>
+#include <QFileInfo>
+#include <QSettings>
+#include <QTextStream>
+#include <QMessageBox>
+
+#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 <QObject>
+#include <QUndoStack>
+
+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 <QObject>
+#include <QHash>
+
+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<QString,Node*> _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 <dev@randomguy3.me.uk>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General 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/>.
+ */
+
+#include "tikzparserdefs.h"
+#include "tikzparser.parser.hpp"
+
+#include <sstream>
+
+
+#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 */
+<INITIAL,xcoord,ycoord,props,noderef>\r\n|\r|\n {
+	yylloc->first_line += 1;
+	yylloc->last_line = yylloc->first_line;
+	yylloc->first_column = yylloc->last_column = 0;
+}
+<INITIAL,xcoord,ycoord,props,noderef>[\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);
+}
+<xcoord>{FLOAT} {
+    yylval->pt = new QPointF();
+    yylval->pt->setX(strtod(yytext,NULL));
+	BEGIN(ycoord);
+}
+<ycoord>, {  }
+<ycoord>{FLOAT} {
+    yylval->pt->setY(strtod(yytext,NULL));
+}
+<ycoord>\) {
+	BEGIN(INITIAL);
+	return COORD;
+}
+
+ /* when we see "[", change parsing mode */
+\[ /*syntaxhlfix]*/ {
+	BEGIN(props);
+	return LEFTBRACKET;
+}
+<props>= {  return EQUALS; }
+<props>, {  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 */
+<props>[^=,\{\] \t\n]([^=,\{\]\n]*[^=,\{\] \t\n])? {
+    char *str = (char*)malloc(sizeof(char)*yyleng + 1);
+    strncpy(str, yytext, yyleng + 1);
+    yylval->str = str;
+	return PROPSTRING;
+}
+<props>\] {
+	BEGIN(INITIAL);
+	return RIGHTBRACKET;
+}
+
+\( {
+	BEGIN(noderef);
+	return LEFTPARENTHESIS;
+}
+<noderef>\. {
+	return FULLSTOP;
+}
+ /* we assume node names (and anchor names) never contain
+	newlines */
+<noderef>[^\.\{\)\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;
+}
+<noderef>\) {
+	BEGIN(INITIAL);
+	return RIGHTPARENTHESIS;
+}
+
+<INITIAL,props>\{ {
+    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; }
+<INITIAL,xcoord,ycoord,props,noderef>. { 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 <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;
+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 <dev@randomguy3.me.uk>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General 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/>.
+ */
+
+#include "tikzparserdefs.h"
+#include "tikzparser.parser.hpp"
+
+#include <sstream>
+
+
+#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 <unistd.h>
+#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 <dev@randomguy3.me.uk>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General 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/>.
+ */
+
+#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 <stddef.h> /* 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 <libintl.h> /* 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 <alloca.h> /* INFRINGES ON USER NAME SPACE */
+#   elif defined _AIX
+#    define YYSTACK_ALLOC __alloca
+#   elif defined _MSC_VER
+#    include <malloc.h> /* 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 <stdlib.h> /* 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 <stdlib.h> /* 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 <stdio.h> /* 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 <dev@randomguy3.me.uk>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General 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/>.
+ */
+
+#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 <pt> COORD "co-ordinate"
+%token <str> PROPSTRING "key/value string"
+%token <str> REFSTRING "string"
+%token <str> 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<str>   nodename
+%type<str>   optanchor
+%type<str>   val
+%type<prop>    property
+%type<data>    extraproperties
+%type<data>    properties
+%type<data>    optproperties
+%type<node>    optedgenode
+%type<noderef> noderef
+%type<noderef> 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 <QString>
+#include <QRectF>
+#include <QDebug>
+
+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
--- /dev/null
+++ b/src/gui/commands.cpp
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 <QPainterPath>
+#include <QPen>
+
+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 <QObject>
+#include <QGraphicsPathItem>
+#include <QPainter>
+#include <QStyleOptionGraphicsItem>
+#include <QWidget>
+#include <QGraphicsEllipseItem>
+
+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 <QMenuBar>
+
+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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainMenu</class>
+ <widget class="QMenuBar" name="MainMenu">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>476</width>
+    <height>22</height>
+   </rect>
+  </property>
+  <widget class="QMenu" name="menuFile">
+   <property name="title">
+    <string>File</string>
+   </property>
+   <addaction name="actionNew"/>
+   <addaction name="actionOpen"/>
+   <addaction name="separator"/>
+   <addaction name="actionClose"/>
+   <addaction name="actionSave"/>
+   <addaction name="actionSave_As"/>
+  </widget>
+  <widget class="QMenu" name="menuEdit">
+   <property name="title">
+    <string>Edit</string>
+   </property>
+   <addaction name="actionUndo"/>
+   <addaction name="actionRedo"/>
+   <addaction name="separator"/>
+   <addaction name="actionCut"/>
+   <addaction name="actionCopy"/>
+   <addaction name="actionPaste"/>
+   <addaction name="actionDelete"/>
+   <addaction name="separator"/>
+   <addaction name="actionSelect_All"/>
+   <addaction name="actionDeselect_All"/>
+  </widget>
+  <widget class="QMenu" name="menuTikz">
+   <property name="title">
+    <string>Tikz</string>
+   </property>
+   <addaction name="actionParse"/>
+  </widget>
+  <widget class="QMenu" name="menuView">
+   <property name="title">
+    <string>View</string>
+   </property>
+   <addaction name="actionZoom_In"/>
+   <addaction name="actionZoom_Out"/>
+  </widget>
+  <action name="actionNew">
+   <property name="text">
+    <string>New...</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+N</string>
+   </property>
+  </action>
+  <action name="actionOpen">
+   <property name="text">
+    <string>Open...</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+O</string>
+   </property>
+  </action>
+  <action name="actionClose">
+   <property name="text">
+    <string>Close</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+W</string>
+   </property>
+  </action>
+  <action name="actionSave">
+   <property name="text">
+    <string>Save</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+S</string>
+   </property>
+  </action>
+  <action name="actionSave_As">
+   <property name="text">
+    <string>Save As...</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Shift+S</string>
+   </property>
+  </action>
+  <action name="actionUndo">
+   <property name="text">
+    <string>Undo</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Z</string>
+   </property>
+  </action>
+  <action name="actionRedo">
+   <property name="text">
+    <string>Redo</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+Shift+Z</string>
+   </property>
+  </action>
+  <action name="actionCut">
+   <property name="text">
+    <string>Cut</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+X</string>
+   </property>
+  </action>
+  <action name="actionCopy">
+   <property name="text">
+    <string>Copy</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+C</string>
+   </property>
+  </action>
+  <action name="actionPaste">
+   <property name="text">
+    <string>Paste</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+V</string>
+   </property>
+  </action>
+  <action name="actionDelete">
+   <property name="text">
+    <string>Delete</string>
+   </property>
+   <property name="shortcut">
+    <string>Backspace</string>
+   </property>
+  </action>
+  <action name="actionSelect_All">
+   <property name="text">
+    <string>Select All</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+A</string>
+   </property>
+  </action>
+  <action name="actionDeselect_All">
+   <property name="text">
+    <string>Deselect All</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+D</string>
+   </property>
+  </action>
+  <action name="actionParse">
+   <property name="text">
+    <string>Parse</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+T</string>
+   </property>
+  </action>
+  <action name="actionZoom_In">
+   <property name="text">
+    <string>Zoom In</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+=</string>
+   </property>
+  </action>
+  <action name="actionZoom_Out">
+   <property name="text">
+    <string>Zoom Out</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+-</string>
+   </property>
+  </action>
+  <addaction name="menuFile"/>
+  <addaction name="menuEdit"/>
+  <addaction name="menuView"/>
+  <addaction name="menuTikz"/>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
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 <QDebug>
+#include <QFile>
+#include <QList>
+#include <QSettings>
+#include <QMessageBox>
+#include <QFileDialog>
+
+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<int> 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 <QMainWindow>
+#include <QGraphicsView>
+
+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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>640</width>
+    <height>480</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>TikZiT - untitled</string>
+  </property>
+  <widget class="QWidget" name="centralWidget">
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <property name="leftMargin">
+     <number>0</number>
+    </property>
+    <property name="topMargin">
+     <number>0</number>
+    </property>
+    <property name="rightMargin">
+     <number>0</number>
+    </property>
+    <property name="bottomMargin">
+     <number>0</number>
+    </property>
+    <item>
+     <widget class="QSplitter" name="splitter">
+      <property name="orientation">
+       <enum>Qt::Vertical</enum>
+      </property>
+      <widget class="TikzView" name="tikzView"/>
+      <widget class="QTextEdit" name="tikzSource">
+       <property name="font">
+        <font>
+         <family>Courier New</family>
+         <pointsize>10</pointsize>
+        </font>
+       </property>
+       <property name="lineWrapMode">
+        <enum>QTextEdit::NoWrap</enum>
+       </property>
+       <property name="html">
+        <string>&lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.0//EN&quot; &quot;http://www.w3.org/TR/REC-html40/strict.dtd&quot;&gt;
+&lt;html&gt;&lt;head&gt;&lt;meta name=&quot;qrichtext&quot; content=&quot;1&quot; /&gt;&lt;style type=&quot;text/css&quot;&gt;
+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>
+      </widget>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QStatusBar" name="statusBar"/>
+  <action name="actionNew">
+   <property name="text">
+    <string>New...</string>
+   </property>
+  </action>
+  <action name="actionOpen">
+   <property name="text">
+    <string>Open...</string>
+   </property>
+  </action>
+  <action name="actionClose">
+   <property name="text">
+    <string>Close</string>
+   </property>
+  </action>
+  <action name="actionSave">
+   <property name="text">
+    <string>Save</string>
+   </property>
+  </action>
+  <action name="actionSave_As">
+   <property name="text">
+    <string>Save As...</string>
+   </property>
+  </action>
+  <action name="actionUndo">
+   <property name="text">
+    <string>Undo</string>
+   </property>
+  </action>
+  <action name="actionRedo">
+   <property name="text">
+    <string>Redo</string>
+   </property>
+  </action>
+  <action name="actionCut">
+   <property name="text">
+    <string>Cut</string>
+   </property>
+  </action>
+  <action name="actionCopy">
+   <property name="text">
+    <string>Copy</string>
+   </property>
+  </action>
+  <action name="actionPase">
+   <property name="text">
+    <string>Paste</string>
+   </property>
+  </action>
+  <action name="actionDelete">
+   <property name="text">
+    <string>Delete</string>
+   </property>
+  </action>
+  <action name="actionSelect_All">
+   <property name="text">
+    <string>Select All</string>
+   </property>
+  </action>
+  <action name="actionDeselect_All">
+   <property name="text">
+    <string>Deselect All</string>
+   </property>
+  </action>
+  <action name="actionParse">
+   <property name="text">
+    <string>Parse</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+T</string>
+   </property>
+  </action>
+  <action name="actionZoom_In">
+   <property name="text">
+    <string>Zoom In</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+=</string>
+   </property>
+  </action>
+  <action name="actionZoom_Out">
+   <property name="text">
+    <string>Zoom Out</string>
+   </property>
+   <property name="shortcut">
+    <string>Ctrl+-</string>
+   </property>
+  </action>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <customwidgets>
+  <customwidget>
+   <class>TikzView</class>
+   <extends>QGraphicsView</extends>
+   <header>tikzview.h</header>
+   <slots>
+    <slot>zoomIn()</slot>
+    <slot>zoomOut()</slot>
+   </slots>
+  </customwidget>
+ </customwidgets>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>actionZoom_In</sender>
+   <signal>triggered()</signal>
+   <receiver>tikzView</receiver>
+   <slot>zoomIn()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>237</x>
+     <y>103</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>actionZoom_Out</sender>
+   <signal>triggered()</signal>
+   <receiver>tikzView</receiver>
+   <slot>zoomOut()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>237</x>
+     <y>103</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>
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 <cmath>
+
+#include <QPen>
+#include <QApplication>
+#include <QBrush>
+#include <QDebug>
+#include <QFont>
+#include <QFontMetrics>
+#include <QPainterPathStroker>
+
+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<qreal> 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<qreal> 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 <QObject>
+#include <QGraphicsItem>
+#include <QPainterPath>
+#include <QRectF>
+
+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 <QModelIndex>
+#include <QDebug>
+#include <QCloseEvent>
+#include <QSettings>
+
+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 <QDockWidget>
+
+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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>PropertyPalette</class>
+ <widget class="QDockWidget" name="PropertyPalette">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>194</width>
+    <height>341</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Properties</string>
+  </property>
+  <widget class="QWidget" name="dockWidgetContents">
+   <layout class="QVBoxLayout" name="verticalLayout">
+    <item>
+     <widget class="QTreeView" name="treeView">
+      <property name="indentation">
+       <number>0</number>
+      </property>
+     </widget>
+    </item>
+   </layout>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>
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 <QPen>
+#include <QBrush>
+#include <QDebug>
+
+
+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<EdgeItem*>(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<NodeItem*>(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<Node*,QPointF> newNodePositions;
+
+                foreach (QGraphicsItem *gi, selectedItems()) {
+                    if (NodeItem *ni = dynamic_cast<NodeItem*>(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<Node*> selNodes;
+        QSet<Edge*> selEdges;
+        getSelection(selNodes, selEdges);
+
+        QMap<int,Node*> deleteNodes;
+        QMap<int,Edge*> 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<Node *> &selNodes, QSet<Edge *> &selEdges)
+{
+    foreach (QGraphicsItem *gi, selectedItems()) {
+        if (NodeItem *ni = dynamic_cast<NodeItem*>(gi)) selNodes << ni->node();
+        if (EdgeItem *ei = dynamic_cast<EdgeItem*>(gi)) selEdges << ei->edge();
+    }
+}
+
+
+TikzDocument *TikzScene::tikzDocument() const
+{
+    return _tikzDocument;
+}
+
+void TikzScene::setTikzDocument(TikzDocument *tikzDocument)
+{
+    _tikzDocument = tikzDocument;
+    graphReplaced();
+}
+
+void TikzScene::refreshAdjacentEdges(QList<Node*> 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<Node*,NodeItem *> &TikzScene::nodeItems()
+{
+    return _nodeItems;
+}
+
+QMap<Edge*,EdgeItem*> &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 <QWidget>
+#include <QGraphicsScene>
+#include <QPainter>
+#include <QRectF>
+#include <QVector>
+#include <QGraphicsEllipseItem>
+#include <QGraphicsSceneMouseEvent>
+
+class TikzScene : public QGraphicsScene
+{
+    Q_OBJECT
+public:
+    TikzScene(TikzDocument *tikzDocument, QObject *parent);
+    ~TikzScene();
+    Graph *graph();
+    QMap<Node*,NodeItem*> &nodeItems();
+    QMap<Edge*,EdgeItem*> &edgeItems();
+    void refreshAdjacentEdges(QList<Node*> 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<Node*,NodeItem*> _nodeItems;
+    QMap<Edge*,EdgeItem*> _edgeItems;
+    QGraphicsLineItem *_drawEdgeItem;
+    EdgeItem *_modifyEdgeItem;
+    bool _firstControlPoint;
+
+    QMap<Node*,QPointF> _oldNodePositions;
+    float _oldWeight;
+    int _oldBend;
+    int _oldInAngle;
+    int _oldOutAngle;
+
+    void getSelection(QSet<Node*> &selNodes, QSet<Edge*> &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 <QDebug>
+
+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 <QObject>
+#include <QWidget>
+#include <QGraphicsView>
+#include <QPainter>
+#include <QGraphicsItem>
+#include <QStyleOptionGraphicsItem>
+#include <QRectF>
+#include <QMouseEvent>
+
+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 <QVector>
+#include <QLayout>
+#include <QVBoxLayout>
+#include <QDebug>
+
+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 <QObject>
+#include <QToolBar>
+#include <QAction>
+#include <QActionGroup>
+
+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 <QGraphicsView>
+
+MoveCommand::MoveCommand(TikzScene *scene,
+                         QMap<Node*, QPointF> oldNodePositions,
+                         QMap<Node*, QPointF> 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<int, Node *> deleteNodes,
+                             QMap<int, Edge *> deleteEdges,
+                             QSet<Edge *> 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 <QUndoCommand>
+
+class MoveCommand : public QUndoCommand
+{
+public:
+    explicit MoveCommand(TikzScene *scene,
+                         QMap<Node*,QPointF> oldNodePositions,
+                         QMap<Node*,QPointF> newNodePositions,
+                         QUndoCommand *parent = 0);
+    void undo() override;
+    void redo() override;
+private:
+    TikzScene *_scene;
+    QMap<Node*,QPointF> _oldNodePositions;
+    QMap<Node*,QPointF> _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<int,Node*> deleteNodes,
+                           QMap<int,Edge*> deleteEdges,
+                           QSet<Edge*> selEdges);
+    void undo() override;
+    void redo() override;
+private:
+    TikzScene *_scene;
+    QMap<int,Node*> _deleteNodes;
+    QMap<int,Edge*> _deleteEdges;
+    QSet<Edge*> _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 <QApplication>
+#include <QMenuBar>
+
+
+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 <QTest>
+#include <QDebug>
+#include <iostream>
+
+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 <QTest>
+#include <QVector>
+
+//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 <QObject>
+
+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 <QObject>
+#include <QTest>
+
+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 <QObject>
+#include <QTest>
+
+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 <QTest>
+#include <QRectF>
+#include <QPointF>
+
+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 <QObject>
+
+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 <QFileDialog>
+#include <QSettings>
+
+// 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 <QObject>
+#include <QVector>
+#include <QPointF>
+#include <QMenuBar>
+#include <QMainWindow>
+#include <QFont>
+
+// 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<MainWindow*> _windows;
+    MainWindow *_activeWindow;
+    QVector<NodeStyle*> _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 <QPoint>
+#include <cmath>
+
+// 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
author	Aleks Kissinger <aleks0@gmail.com>	2018-01-04 16:00:52 +0100
committer	Aleks Kissinger <aleks0@gmail.com>	2018-01-04 16:00:52 +0100
commit	738ecbd5fad2b46836bfd6a94aeebf165ae2bbca (patch)
tree	df04709807cc9ec8481a3ebc7d80ac25e5b2f457 /src
parent	0421a96749743868554d44585050b1b3d04864d2 (diff)