diff --git a/regression-tests/g-issue150.gmn b/regression-tests/g-issue150.gmn
new file mode 100644
index 000000000..1867dd78c
--- /dev/null
+++ b/regression-tests/g-issue150.gmn
@@ -0,0 +1,5 @@
+{[ 
+   (* meas. 1 *)  \clef<"g2"> \key<0> \meter<"4/4", autoBarlines="off", autoMeasuresNum="system"> \harmony<"G7sus", position="above", dy=-0.6hs> \beamsOff \tieBegin:1 g1/1 \harmony<"Gm9", position="above", dy=-0.6hs, dx=-0.50000000dur> \bar<measNum=2> 
+   (* meas. 2 *)  \harmony<"G7sus", position="above", dy=-0.6hs> \stemsUp \beamsOff g1/2. \tieEnd:1 \harmony<"Gm9", position="above", dy=-0.6hs, dx=-0.25000000dur> _/4 \bar<measNum=3> 
+   (* meas. 3 *)  \harmony<"Am/C", position="above", dy=-0.6hs> \stemsAuto \beamsOff c1/1 \harmony<"B&/C", position="above", dy=-0.6hs, dx=-0.50000000dur> \staff<1> \endBar ]
+  }
\ No newline at end of file
diff --git a/src/engine/abstract/TagParameterFloat.cpp b/src/engine/abstract/TagParameterFloat.cpp
index 68b85c778..f99f63f9e 100644
--- a/src/engine/abstract/TagParameterFloat.cpp
+++ b/src/engine/abstract/TagParameterFloat.cpp
@@ -18,6 +18,7 @@
 
 #include <string>
 #include <regex>
+#include <iomanip>
 
 #include "TagParameterFloat.h"
 #include "ARUnits.h"
@@ -32,6 +33,8 @@ TagParameterFloat::TagParameterFloat(const TagParameterFloat & tpf)
 {
 	fUnittag = tpf.fUnittag;
 	fValue = tpf.fValue;
+	fIsDuration = tpf.fIsDuration;
+	fDuration = tpf.fDuration;
 	fUnit = tpf.getUnit();
 }
 
@@ -44,6 +47,8 @@ void  TagParameterFloat::set( const TagParameterFloat & in )
 	fUnit = in.getUnit();
 	fUnittag = in.fUnittag;
 	fValue = in.fValue;
+	fIsDuration = in.fIsDuration;
+	fDuration = in.fDuration;
 }
 
 
@@ -51,11 +56,16 @@ void TagParameterFloat::print(std::ostream& out)
 {
 	TagParameter::print (out);
 	const char* u = TagIsUnitTag() ? getUnit() : "";
-	out << getValue() << u;
+	if (fIsDuration) {
+		out << std::string(fDuration) << "dur";
+	}
+	else out << getValue() << u;
 }
 
 void TagParameterFloat::reset(float inFloatValue, const char * inUnit)
 {
+	fIsDuration = false;
+	fDuration = Fraction(0,1);
 	fValue = inFloatValue;
 	string u (inUnit);
 	if (u.size()) {
@@ -70,6 +80,8 @@ void TagParameterFloat::reset(float inFloatValue, const char * inUnit)
 
 const TYPE_FLOATPARAMETER TagParameterFloat::getValue(float curLSPACE) const
 {
+	if (fIsDuration)
+		return (float) fDuration;
 	if (fUnittag) {
 		string tmpunit;
 		if (fUnit.empty()) {
@@ -95,6 +107,43 @@ const TYPE_FLOATPARAMETER TagParameterFloat::getValue(float curLSPACE) const
 	return fValue;
 }
 
+static bool parseDots (int dots, Fraction& value)
+{
+	if (!dots) return true;
+	Fraction add = value;
+	for (int i=0; i<dots; i++) {
+		add = add * Frac_1_2;
+		value += add;
+	}
+	return true;
+}
+
+static bool parseDurationString(const std::string& val, Fraction& out)
+{
+	// syntax: [sign]num/den[.]*dur or [sign]decimal dur (dur suffix required)
+	std::regex fracExp("^\\s*([+-]?)(\\d+)/(\\d+)(\\.*)dur\\s*$");
+	std::regex decExp("^\\s*([+-]?\\d+(?:\\.\\d+)?)dur\\s*$");
+	std::smatch match;
+
+	if (std::regex_search(val, match, fracExp)) {
+		long num = std::stol(match[2]);
+		long den = std::stol(match[3]);
+		if (den == 0) return false;
+		int dots = (int)match[4].str().size();
+		out = Fraction((int)num, (int)den);
+		parseDots(dots, out);
+		if (match[1].str() == "-")
+			out = out * -1;
+		return true;
+	}
+	if (std::regex_search(val, match, decExp)) {
+		double d = std::stod(match[1]);
+		out = Fraction(d);
+		return true;
+	}
+	return false;
+}
+
 void TagParameterFloat::setValue(const char * p)
 {
 	string val = p;
@@ -103,19 +152,34 @@ void TagParameterFloat::setValue(const char * p)
 	std::smatch match;
 	
 	fUnit.clear();
+	fIsDuration = false;
+	fDuration = Fraction(0,1);
 	if (regex_search (val, match, e)) {
 		string vstr = match[1];
 		fValue = (float)atof(vstr.c_str());
 		fUnit = match[2];
 		fUnittag = true;
 	}
-	else fValue = (float)atof(p);
+	else {
+		Fraction dur;
+		if (parseDurationString(val, dur)) {
+			fDuration = dur;
+			fIsDuration = true;
+			fUnittag = false;
+			fValue = (float) dur;
+		}
+		else fValue = (float)atof(p);
+	}
 }
 
 void TagParameterFloat::setUnit(const char * unit)
 {
 	fUnit = unit;
 	fUnittag = true;
+	if (fUnit == "dur") {
+		fIsDuration = true;
+		fDuration = Fraction(fValue);
+	}
 }
 
 bool TagParameterFloat::copyValue(const TagParameter * tp)
@@ -123,6 +187,8 @@ bool TagParameterFloat::copyValue(const TagParameter * tp)
 	const TagParameterFloat * tpf = TagParameterFloat::cast(tp);
 	if (!tpf) return false;
 
+	fIsDuration = tpf->fIsDuration;
+	fDuration = tpf->fDuration;
 	if (fUnittag)
 		fUnit = tpf->getUnit();
 	else if (tpf->getUnit()[0] != 0)
diff --git a/src/engine/abstract/TagParameterFloat.h b/src/engine/abstract/TagParameterFloat.h
index 2dab641f2..79ce19c56 100644
--- a/src/engine/abstract/TagParameterFloat.h
+++ b/src/engine/abstract/TagParameterFloat.h
@@ -16,6 +16,7 @@
 */
 
 #include "TagParameter.h"
+#include "Fraction.h"
 
 typedef float TYPE_FLOATPARAMETER;
 
@@ -43,6 +44,8 @@ class TagParameterFloat : public TagParameter
 		virtual bool			isFloat() const		{ return true; }
 
 		const TYPE_FLOATPARAMETER getValue( float curLSPACE = 50.0f ) const;
+		bool					isDuration() const	{ return fIsDuration; }
+		const Fraction &		getDuration() const { return fDuration; }
 
 		static bool     convertValue(float value, double &toValue, const char * unit, float curLSPACE = 50.0f);
 
@@ -63,6 +66,8 @@ class TagParameterFloat : public TagParameter
 //		enum { kUnitLen=3 };
 		std::string			fUnit;
 		TYPE_FLOATPARAMETER fValue;
+		bool				fIsDuration = false;
+		Fraction			fDuration;
 		
 	private:
 		using TagParameter::set;
diff --git a/src/engine/graphic/GRStaff.cpp b/src/engine/graphic/GRStaff.cpp
index 52271c0d5..58a7b9407 100644
--- a/src/engine/graphic/GRStaff.cpp
+++ b/src/engine/graphic/GRStaff.cpp
@@ -76,6 +76,7 @@ using namespace std;
 #include "GRMusic.h"
 #include "GRNote.h"
 #include "GRRest.h"
+#include "GRTag.h"
 #include "GRRepeatBegin.h"
 #include "GRRepeatEnd.h"
 #include "GRRod.h"
@@ -2003,13 +2004,22 @@ void GRStaff::FinishStaff()
 				date = e->getRelativeTimePosition();
 				duration = e->getDuration();
 			}
-      }
+    }
     }
 	setDuration (date - getRelativeTimePosition() + duration);
     vector<GRPositionTag *>::iterator i;
     for (i=ptags.begin(); i!=ptags.end(); i++) {
        (*i)->FinishPTag (this);
     }
+    // apply duration-based dx offsets after position tags have set their anchors
+    {
+        GuidoPos p = mCompElements.GetHeadPosition();
+        while (p) {
+            GRNotationElement * e = mCompElements.GetNext(p);
+            GRTag * tag = dynamic_cast<GRTag *>(e);
+            if (tag) tag->applyDurationDx(this);
+        }
+    }
     if (mStaffState.fMultiVoiceCollisions) checkMultiVoiceNotesCollision();
 	updateBoundingBox();
 //	GRStaffOnOffVisitor v;
@@ -2430,10 +2440,103 @@ float GRStaff::getXEndPosition(TYPE_TIMEPOSITION pos, TYPE_DURATION dur) const
 			}
 			delete elmtsAtEndOfDuration;
 		}
-	}
+    }
     return x;
 }
 
+// ----------------------------------------------------------------------------
+float GRStaff::getXForTime(const TYPE_TIMEPOSITION& tp) const
+{
+	const NEPointerList& elts = getElements();
+	const GRNotationElement* prev = nullptr;
+	const GRNotationElement* next = nullptr;
+
+	GuidoPos pos = elts.GetHeadPosition();
+	while (pos) {
+		const GRNotationElement* e = elts.GetNext(pos);
+		TYPE_TIMEPOSITION et = e->getRelativeTimePosition();
+		if (et <= tp) prev = e;
+		if (et >= tp) { next = e; break; }
+	}
+	if (!prev) prev = next;
+	if (!next) next = prev;
+	if (!prev) return 0;
+
+	float xPrev = prev->getPosition().x;
+	float xNext = next ? next->getPosition().x : xPrev;
+	TYPE_TIMEPOSITION tPrev = prev->getRelativeTimePosition();
+	TYPE_TIMEPOSITION tNext = next ? next->getRelativeTimePosition() : tPrev;
+
+	if (tNext == tPrev) return xPrev;
+	if (tp <= tPrev) return xPrev;
+	if (tp >= tNext) return xNext;
+
+	double ratio = double(tp - tPrev) / double(tNext - tPrev);
+	return xPrev + (float)((xNext - xPrev) * ratio);
+}
+
+// ----------------------------------------------------------------------------
+void GRStaff::getMeasureBounds(const TYPE_TIMEPOSITION& tp, TYPE_TIMEPOSITION& start, TYPE_TIMEPOSITION& end) const
+{
+	start = DURATION_0;
+	end = getDuration();
+
+	TYPE_TIMEPOSITION prevBar = DURATION_0;
+	bool prevSet = false;
+	TYPE_TIMEPOSITION nextBar = end;
+	bool nextSet = false;
+
+	GuidoPos p = mCompElements.GetHeadPosition();
+	while (p) {
+		const GRNotationElement* e = mCompElements.GetNext(p);
+		const GRBar* b = e->isGRBar();
+		if (!b) continue;
+
+		const TYPE_TIMEPOSITION bt = e->getRelativeTimePosition();
+		if (bt <= tp) {
+			if (!prevSet || bt > prevBar) {
+				prevBar = bt;
+				prevSet = true;
+			}
+		}
+		else {
+			if (!nextSet || bt < nextBar) {
+				nextBar = bt;
+				nextSet = true;
+			}
+		}
+	}
+
+	if (prevSet) start = prevBar;
+	if (nextSet) end = nextBar;
+
+	// If we only know the next bar, derive the measure start from the meter
+	if (!prevSet && nextSet) {
+		TYPE_DURATION mdur (1,1);
+		const ARMeter* meter = getCurMeter();
+		if (meter) {
+			TYPE_DURATION meterDur = meter->getMeterDuration();
+			if (meterDur > DURATION_0)
+				mdur = meterDur;
+		}
+		start = nextBar - mdur;
+		if (start < DURATION_0)
+			start = DURATION_0;
+	}
+
+	// fallback: if no bar ahead (or zero-length), derive from meter
+	if (end <= start) {
+		const ARMeter* meter = getCurMeter();
+		if (meter) {
+			TYPE_DURATION mdur = meter->getMeterDuration();
+			if (mdur > DURATION_0)
+				end = start + mdur;
+		}
+		if (end <= start) // ensure progress
+			end = start + TYPE_DURATION(1,1);
+	}
+}
+
 void GRStaff::setOnOff(bool on, TYPE_TIMEPOSITION tp)
 {
 //	fOnOffList.push_back (make_pair(tp,on));
diff --git a/src/engine/graphic/GRStaff.h b/src/engine/graphic/GRStaff.h
index db9c0e333..eb49f5d99 100644
--- a/src/engine/graphic/GRStaff.h
+++ b/src/engine/graphic/GRStaff.h
@@ -208,6 +208,8 @@ class GRStaff : public GRCompositeNotationElement
 		GRStaffState &          getGRStaffState()		{ return mStaffState; }
 		const GRStaffState &    getGRStaffState() const { return mStaffState; }
 		float					getXEndPosition(TYPE_TIMEPOSITION pos, TYPE_DURATION dur) const;
+		float					getXForTime(const TYPE_TIMEPOSITION& tp) const;
+		void					getMeasureBounds(const TYPE_TIMEPOSITION& tp, TYPE_TIMEPOSITION& start, TYPE_TIMEPOSITION& end) const;
         const ARMeter *			getCurMeter() const		{ return mStaffState.curmeter; }
 
 		virtual float       getNotePosition(TYPE_PITCH pit, TYPE_REGISTER oct) const;
diff --git a/src/engine/graphic/GRTag.cpp b/src/engine/graphic/GRTag.cpp
index 45cbaaac8..937a7056d 100644
--- a/src/engine/graphic/GRTag.cpp
+++ b/src/engine/graphic/GRTag.cpp
@@ -17,6 +17,8 @@
 #include "TagParameterFloat.h"
 #include "GRDefine.h"
 #include "GRTag.h"
+#include "GRStaff.h"
+#include "GRNotationElement.h"
 
 GRTag::GRTag( const ARMusicalTag * artag, float curLSPACE )
 	: isautotag(0), sconst(SCONST_DEFAULT)
@@ -41,7 +43,13 @@ GRTag::GRTag( const ARMusicalTag * artag, float curLSPACE )
 
 		const TagParameterFloat * dx = artag->getDX();
 		const TagParameterFloat * dy = artag->getDY();
-		if (dx)	mTagOffset.x = (GCoord) dx->getValue(curLSPACE);
+		if (dx)	{
+			if (dx->isDuration()) {
+				fHasDurationDx = true;
+				fDxDuration = dx->getDuration();
+			}
+			else mTagOffset.x = (GCoord) dx->getValue(curLSPACE);
+		}
 		if (dy)	mTagOffset.y -= (GCoord) dy->getValue(curLSPACE);
 
 		const TagParameterFloat * tps = artag->getSize();
@@ -65,3 +73,52 @@ bool GRTag::IsStateTag() const			{ return (fTagType == STAFFTAG); }
 int  GRTag::getIsAuto() const			{ return isautotag; }
 bool GRTag::operator==(const GRTag & tag) const	{ return false; }
 
+void GRTag::applyDurationDx(GRStaff * grstaff)
+{
+	if (!fHasDurationDx || fDurationDxApplied || !grstaff)
+		return;
+
+	GRNotationElement * ne = dynamic_cast<GRNotationElement*>(this);
+	if (!ne) return;
+
+	TYPE_TIMEPOSITION baseTime = ne->getRelativeTimePosition();
+	TYPE_TIMEPOSITION measStart, measEnd;
+	grstaff->getMeasureBounds(baseTime, measStart, measEnd);
+
+	// derive spatial offset from time offset
+	const TYPE_TIMEPOSITION targetTime = baseTime + fDxDuration;
+	TYPE_TIMEPOSITION targetMeasStart = measStart;
+	TYPE_TIMEPOSITION targetMeasEnd   = measEnd;
+
+	// If the target time crosses a barline, compute offsets in the measure where it lands.
+	if (targetTime < measStart || targetTime > measEnd) {
+		grstaff->getMeasureBounds(targetTime, targetMeasStart, targetMeasEnd);
+	}
+
+	const float baseX = grstaff->getXForTime(baseTime);
+
+	float targetX = baseX;
+	if (targetTime >= targetMeasStart && targetTime <= targetMeasEnd) {
+		targetX = grstaff->getXForTime(targetTime);
+	}
+	else if (targetMeasEnd != targetMeasStart) {
+		const double ratio = double(targetTime - targetMeasStart) /
+							 double(targetMeasEnd - targetMeasStart);
+		const float targetStartX = grstaff->getXForTime(targetMeasStart);
+		const float targetEndX   = grstaff->getXForTime(targetMeasEnd);
+		const float targetWidth  = targetEndX - targetStartX;
+		targetX = targetStartX + float(ratio * targetWidth);
+	}
+	const float dx = targetX - baseX;
+
+//	std::cerr << "[duration-dx] baseTime=" << double(baseTime)
+//			  << " targetTime=" << double(targetTime)
+//			  << " baseMeas=[" << double(measStart) << "," << double(measEnd) << "]"
+//			  << " targetMeas=[" << double(targetMeasStart) << "," << double(targetMeasEnd) << "]"
+//			  << " baseX=" << baseX << " targetX=" << targetX
+//			  << " dx=" << dx << std::endl;
+
+	mTagOffset.x += dx;
+
+	fDurationDxApplied = true;
+}
diff --git a/src/engine/graphic/GRTag.h b/src/engine/graphic/GRTag.h
index e40c36c68..a61318dd2 100644
--- a/src/engine/graphic/GRTag.h
+++ b/src/engine/graphic/GRTag.h
@@ -16,8 +16,10 @@
 */
 
 #include "NVPoint.h"
+#include "Fraction.h"
 
 class NVstring;
+class GRStaff;
 
 // The StaffManager holds different hashtables for the
 // Synchronizsation elements to detect contraditions.
@@ -52,6 +54,7 @@ class GRTag
 	virtual const NVPoint& getOffset() const    { return mTagOffset; }
 	virtual float       getSize() const         { return mTagSize; }
 	virtual float       getSConst() const       { return sconst; }
+	virtual void        applyDurationDx(GRStaff * grstaff);
 
     // returns name of a font if present ...
 	virtual const char*  getFont() const         { return fFontName.c_str(); }
@@ -83,6 +86,10 @@ class GRTag
 	float 	mTagSize;
 	NVPoint mTagOffset;
 
+	bool	fHasDurationDx = false;
+	bool	fDurationDxApplied = false;
+	Fraction fDxDuration;
+
 private:
 	int 	fError		= 0;
 	TAGTYPE fTagType	= VOICETAG;
diff --git a/src/engine/parser/guido.l b/src/engine/parser/guido.l
index 230000553..6a56b9dac 100644
--- a/src/engine/parser/guido.l
+++ b/src/engine/parser/guido.l
@@ -140,7 +140,7 @@ EOL		[\x0a\x0d]
 
 "ms"				return MLS;
 "s"					return SEC;
-"m"|"cm"|"mm"|"in"|"pt"|"pc"|"hs"|"rl"		yyextra->fText = yytext; return UNIT;
+"m"|"cm"|"mm"|"in"|"pt"|"pc"|"hs"|"rl"|"dur"	yyextra->fText = yytext; return UNIT;
 
 
 "<"					BEGIN PARAM; return STARTPARAM;
diff --git a/src/engine/parser/guidolex.cpp b/src/engine/parser/guidolex.cpp
index b99f1b707..d9216b7e9 100644
--- a/src/engine/parser/guidolex.cpp
+++ b/src/engine/parser/guidolex.cpp
@@ -1,6 +1,6 @@
-#line 1 "guidolex.cpp"
+#line 1 "src/engine/parser/guidolex.cpp"
 
-#line 3 "guidolex.cpp"
+#line 3 "src/engine/parser/guidolex.cpp"
 
 #define  YY_INT_ALIGNED short int
 
@@ -281,6 +281,7 @@ 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;
@@ -419,7 +420,7 @@ typedef size_t yy_size_t;
      */
     #define  YY_LESS_LINENO(n) \
             do { \
-                int yyl;\
+                yy_size_t yyl;\
                 for ( yyl = n; yyl < yyleng; ++yyl )\
                     if ( yytext[yyl] == '\n' )\
                         --yylineno;\
@@ -464,7 +465,7 @@ struct yy_buffer_state
 	/* Number of characters read into yy_ch_buf, not including EOB
 	 * characters.
 	 */
-	int yy_n_chars;
+	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
@@ -541,7 +542,7 @@ static void yy_init_buffer ( YY_BUFFER_STATE b, FILE *file , yyscan_t yyscanner
 
 YY_BUFFER_STATE yy_scan_buffer ( char *base, yy_size_t size , yyscan_t yyscanner );
 YY_BUFFER_STATE yy_scan_string ( const char *yy_str , yyscan_t yyscanner );
-YY_BUFFER_STATE yy_scan_bytes ( const char *bytes, int len , yyscan_t yyscanner );
+YY_BUFFER_STATE yy_scan_bytes ( const 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 );
@@ -589,7 +590,7 @@ static void yynoreturn yy_fatal_error ( const char* msg , yyscan_t yyscanner );
 #define YY_DO_BEFORE_ACTION \
 	yyg->yytext_ptr = yy_bp; \
 	yyg->yytext_ptr -= yyg->yy_more_len; \
-	yyleng = (int) (yy_cp - yyg->yytext_ptr); \
+	yyleng = (yy_size_t) (yy_cp - yyg->yytext_ptr); \
 	yyg->yy_hold_char = *yy_cp; \
 	*yy_cp = '\0'; \
 	yyg->yy_c_buf_p = yy_cp;
@@ -602,7 +603,7 @@ struct yy_trans_info
 	flex_int32_t yy_verify;
 	flex_int32_t yy_nxt;
 	};
-static const flex_int16_t yy_accept[148] =
+static const flex_int16_t yy_accept[150] =
     {   0,
         0,    0,    0,    0,   11,   11,    0,    0,    0,    0,
        53,   51,   49,   50,   50,   51,   26,   51,    7,   27,
@@ -616,10 +617,10 @@ static const flex_int16_t yy_accept[148] =
         0,   10,    0,    2,    0,    3,   24,    4,    0,    1,
 
         0,   48,    0,   38,    0,    0,   34,    0,   40,    0,
-        0,    0,   32,   44,    0,    9,   11,   12,   13,   36,
-       36,   36,   34,   36,   36,   36,   36,   36,   32,   36,
-       36,    0,   39,    0,    5,    6,   25,   38,   41,    0,
-       36,   36,    0,   36,   43,   36,    0
+        0,    0,    0,   32,   44,    0,    9,   11,   12,   13,
+       36,   36,   36,   34,   36,   36,   36,   36,   36,   36,
+       32,   36,   36,    0,   39,    0,    5,    6,   25,   38,
+       41,    0,   36,   36,    0,   36,   43,   36,    0
     } ;
 
 static const YY_CHAR yy_ec[256] =
@@ -636,8 +637,8 @@ static const YY_CHAR yy_ec[256] =
        28,   29,   30,    1,   31,    1,   32,   33,   34,   35,
 
        36,   37,   38,   39,   40,   27,   27,   41,   42,   43,
-       44,   45,   27,   46,   47,   48,   27,   27,   27,   27,
-       49,   27,   50,   51,   52,    1,    1,    1,    1,    1,
+       44,   45,   27,   46,   47,   48,   49,   27,   27,   27,
+       50,   27,   51,   52,   53,    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,
@@ -654,132 +655,134 @@ static const YY_CHAR yy_ec[256] =
         1,    1,    1,    1,    1
     } ;
 
-static const YY_CHAR yy_meta[53] =
+static const YY_CHAR yy_meta[54] =
     {   0,
         1,    1,    2,    1,    1,    1,    1,    1,    1,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    3,
         3,    1,    1,    1,    1,    1,    4,    1,    1,    1,
         4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
-        4,    4,    4,    4,    4,    4,    4,    4,    4,    1,
-        1,    1
+        4,    4,    4,    4,    4,    4,    4,    4,    4,    4,
+        1,    1,    1
     } ;
 
-static const flex_int16_t yy_base[158] =
+static const flex_int16_t yy_base[160] =
     {   0,
-        0,    0,   50,   52,   54,   57,   46,    0,    0,    0,
-      255,  256,   94,  256,  256,   68,  256,    0,  256,  256,
-       87,  240,  256,  256,   44,  256,   84,   89,  256,   93,
-       41,  256,  256,  256,  256,    0,  256,  256,  213,  256,
-       75,   68,  210,   27,  211,  203,  206,  216,   78,   85,
-       85,  101,  207,  256,  256,  256,  256,   72,   97,  256,
-      120,  232,  232,  256,    0,    0,  204,    0,   87,   88,
-      201,   98,  202,  194,  197,  207,   95,  100,   95,  118,
-      198,  138,  256,  223,  138,  256,  143,    0,  140,  256,
-      146,  256,  132,  136,  139,  143,  218,  145,  150,  156,
-
-      151,  256,  163,    0,  188,  187,  256,  186,  256,  179,
-      158,  157,  256,  256,  162,  175,  178,  256,  256,    0,
-      154,  153,    0,  152,    0,  153,  150,  149,    0,    0,
-      154,  177,    0,  173,  166,  168,  256,    0,  256,  146,
-        0,  145,  143,  142,  256,    0,  256,  206,  210,  214,
-      186,  218,  222,  151,  224,  226,  228
+        0,    0,   51,   53,   55,   58,   47,    0,    0,    0,
+      261,  262,   96,  262,  262,   70,  262,    0,  262,  262,
+       89,  246,  262,  262,   45,  262,   86,   91,  262,   95,
+       42,  262,  262,  262,  262,    0,  262,  262,  219,  262,
+       35,   70,  216,   28,  217,  209,  212,  222,   80,   69,
+       85,  102,  213,  262,  262,  262,  262,  121,  125,  262,
+      127,  238,  238,  262,    0,    0,  210,    0,   92,   95,
+      207,  101,  208,  200,  203,  213,   96,  103,  104,  126,
+      204,  147,  262,  229,  142,  262,  147,    0,  143,  262,
+      150,  262,  137,  142,  144,  157,  224,  147,  153,  162,
+
+      159,  262,  164,    0,  194,  193,  262,  192,  262,  192,
+      192,  181,  161,  262,  262,  166,  181,  186,  262,  262,
+        0,  159,  158,    0,  157,    0,  157,  157,  154,  153,
+        0,    0,  158,  181,    0,  180,  172,  174,  262,    0,
+      262,  150,    0,  149,  146,  111,  262,    0,  262,  210,
+      214,  218,  151,  222,  226,   98,  228,  230,  232
     } ;
 
-static const flex_int16_t yy_def[158] =
+static const flex_int16_t yy_def[160] =
     {   0,
-      147,    1,  148,  148,  149,  149,    1,    7,    1,    1,
-      147,  147,  147,  147,  147,  150,  147,  151,  147,  147,
-      152,  147,  147,  147,  147,  147,  147,  147,  147,  147,
-      153,  147,  147,  147,  147,  154,  147,  147,  147,  147,
-      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
-      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
-      147,  147,  147,  147,  155,  155,  155,  155,  155,  155,
-      155,  155,  155,  155,  155,  155,  155,  155,  155,  155,
-      155,  147,  147,  147,  150,  147,  150,  156,  152,  147,
-      152,  147,  147,  147,  147,  147,  147,  147,  147,  147,
-
-      153,  147,  147,  157,  147,  147,  147,  147,  147,  147,
-      147,  147,  147,  147,  147,  147,  147,  147,  147,  155,
-      155,  155,  155,  155,  155,  155,  155,  155,  155,  155,
-      155,  150,  156,  152,  147,  147,  147,  157,  147,  147,
-      155,  155,  147,  155,  147,  155,    0,  147,  147,  147,
-      147,  147,  147,  147,  147,  147,  147
+      149,    1,  150,  150,  151,  151,    1,    7,    1,    1,
+      149,  149,  149,  149,  149,  152,  149,  153,  149,  149,
+      154,  149,  149,  149,  149,  149,  149,  149,  149,  149,
+      155,  149,  149,  149,  149,  156,  149,  149,  149,  149,
+      149,  149,  149,  149,  149,  149,  149,  149,  149,  149,
+      149,  149,  149,  149,  149,  149,  149,  149,  149,  149,
+      149,  149,  149,  149,  157,  157,  157,  157,  157,  157,
+      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
+      157,  149,  149,  149,  152,  149,  152,  158,  154,  149,
+      154,  149,  149,  149,  149,  149,  149,  149,  149,  149,
+
+      155,  149,  149,  159,  149,  149,  149,  149,  149,  149,
+      149,  149,  149,  149,  149,  149,  149,  149,  149,  149,
+      157,  157,  157,  157,  157,  157,  157,  157,  157,  157,
+      157,  157,  157,  152,  158,  154,  149,  149,  149,  159,
+      149,  149,  157,  157,  149,  157,  149,  157,    0,  149,
+      149,  149,  149,  149,  149,  149,  149,  149,  149
     } ;
 
-static const flex_int16_t yy_nxt[309] =
+static const flex_int16_t yy_nxt[316] =
     {   0,
        12,   13,   14,   15,   13,   16,   17,   18,   19,   20,
        21,   22,   23,   24,   25,   26,   27,   28,   29,   30,
        30,   31,   32,   33,   34,   12,   12,   35,   36,   37,
        38,   39,   40,   41,   42,   43,   44,   45,   46,   47,
-       48,   49,   12,   12,   50,   51,   52,   53,   12,   54,
-       55,   56,   58,   59,   58,   59,   61,   61,  109,   61,
-       61,   93,  102,   94,   94,   62,  111,   63,   62,  103,
-       63,   64,   65,   86,  116,  116,   66,   67,   68,   69,
-       70,   71,   72,   73,   74,   75,   76,   77,   65,   65,
-       78,   79,   80,   81,   65,   82,   87,   90,   82,  116,
-
-      116,   95,   83,   96,   96,   84,   97,  108,   98,   98,
-       99,  109,  100,  100,  106,   91,  107,  109,  107,  107,
-      109,  114,  117,  117,  113,  107,  122,  124,  123,  125,
-      125,  125,  107,  123,  125,  123,  123,  127,  130,   82,
-      109,  129,   82,   86,  115,  147,   83,  123,  147,   84,
-       90,  135,  135,   93,  104,   94,   94,  125,  136,  136,
-       95,  131,   96,   96,   98,   98,   87,  101,   91,   98,
-       98,  132,  102,   99,  134,  100,  100,  116,  116,  103,
-      117,  117,   86,   90,  101,  135,  135,  136,  136,   88,
-      146,  145,  144,  143,  125,  141,  141,  142,  141,  141,
-
-      141,   91,  109,  139,  139,   87,   57,   57,   57,   57,
-       60,   60,   60,   60,   85,   85,   85,   85,   89,   89,
-       89,   89,  101,  140,  101,  101,  120,  120,  133,  133,
-      138,  138,  139,  139,  139,  137,   92,  125,  125,  123,
-      123,  128,  126,  121,  119,  118,  109,  109,  107,  107,
-      112,  110,  105,   92,  147,   11,  147,  147,  147,  147,
-      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
-      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
-      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
-      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
-
-      147,  147,  147,  147,  147,  147,  147,  147
+       48,   49,   12,   12,   50,   51,   52,   53,   12,   12,
+       54,   55,   56,   58,   59,   58,   59,   61,   61,  109,
+       61,   61,   93,  102,   94,   94,   62,  112,   63,   62,
+      103,   63,   64,   65,  106,   86,  107,   66,   67,   68,
+       69,   70,   71,   72,   73,   74,   75,   76,   77,   65,
+       65,   78,   79,   80,   81,   65,   65,   82,   87,   90,
+
+       82,  104,  107,   95,   83,   96,   96,   84,   97,  108,
+       98,   98,   99,  109,  100,  100,  107,   91,  110,  109,
+      109,  107,  115,  117,  117,  107,  114,  117,  117,  118,
+      118,  123,  126,  124,  125,  126,  124,  124,  126,  126,
+      129,  109,  131,  127,  124,  116,  132,   86,   82,  149,
+      124,   82,  149,   90,   88,   83,  137,  137,   84,   93,
+      148,   94,   94,  138,  138,  126,   98,   98,  101,  133,
+       87,   91,   98,   98,   95,  134,   96,   96,  136,   99,
+      102,  100,  100,  117,  117,  101,   86,  103,  118,  118,
+       90,  137,  137,  138,  138,  147,  146,  145,  126,  143,
+
+      143,  144,  124,  143,  143,  143,  109,  141,   91,   87,
+       57,   57,   57,   57,   60,   60,   60,   60,   85,   85,
+       85,   85,   89,   89,   89,   89,  101,  141,  101,  101,
+      121,  121,  135,  135,  140,  140,  142,  107,  141,  141,
+      141,  139,   92,  126,  126,  124,  124,  130,  128,  122,
+      120,  119,  109,  109,  107,  107,  113,  111,  105,   92,
+      149,   11,  149,  149,  149,  149,  149,  149,  149,  149,
+      149,  149,  149,  149,  149,  149,  149,  149,  149,  149,
+      149,  149,  149,  149,  149,  149,  149,  149,  149,  149,
+      149,  149,  149,  149,  149,  149,  149,  149,  149,  149,
+
+      149,  149,  149,  149,  149,  149,  149,  149,  149,  149,
+      149,  149,  149,  149,  149
     } ;
 
-static const flex_int16_t yy_chk[309] =
+static const flex_int16_t yy_chk[316] =
     {   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,    1,
         1,    1,    1,    1,    1,    1,    1,    1,    1,    1,
-        1,    1,    3,    3,    4,    4,    5,    5,   44,    6,
-        6,   25,   31,   25,   25,    5,   44,    5,    6,   31,
-        6,    7,    7,   16,   58,   58,    7,    7,    7,    7,
+        1,    1,    1,    3,    3,    4,    4,    5,    5,   44,
+        6,    6,   25,   31,   25,   25,    5,   44,    5,    6,
+       31,    6,    7,    7,   41,   16,   41,    7,    7,    7,
         7,    7,    7,    7,    7,    7,    7,    7,    7,    7,
-        7,    7,    7,    7,    7,   13,   16,   21,   13,   59,
-
-       59,   27,   13,   27,   27,   13,   28,   42,   28,   28,
-       30,   42,   30,   30,   41,   21,   41,   49,   50,   49,
-       51,   52,   61,   61,   49,   51,   69,   70,   69,   72,
-       79,   70,   50,   78,   77,   79,   77,   72,   80,   82,
-       52,   77,   82,   85,   52,   87,   82,   78,   91,   82,
-       89,   93,   93,   94,  154,   94,   94,   80,   95,   95,
-       96,   80,   96,   96,   98,   98,   85,  103,   89,   99,
-       99,   87,  101,  100,   91,  100,  100,  116,  116,  101,
-      117,  117,  132,  134,  103,  135,  135,  136,  136,  151,
-      144,  143,  142,  140,  131,  128,  127,  126,  124,  122,
-
-      121,  134,  115,  112,  111,  132,  148,  148,  148,  148,
-      149,  149,  149,  149,  150,  150,  150,  150,  152,  152,
-      152,  152,  153,  110,  153,  153,  155,  155,  156,  156,
-      157,  157,  108,  106,  105,   97,   84,   81,   76,   75,
-       74,   73,   71,   67,   63,   62,   53,   48,   47,   46,
-       45,   43,   39,   22,   11,  147,  147,  147,  147,  147,
-      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
-      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
-      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
-      147,  147,  147,  147,  147,  147,  147,  147,  147,  147,
-
-      147,  147,  147,  147,  147,  147,  147,  147
+        7,    7,    7,    7,    7,    7,    7,   13,   16,   21,
+
+       13,  156,   50,   27,   13,   27,   27,   13,   28,   42,
+       28,   28,   30,   42,   30,   30,   50,   21,   42,   49,
+       51,   49,   52,   58,   58,   51,   49,   59,   59,   61,
+       61,   69,   72,   69,   70,   77,   78,   77,   70,   79,
+       72,   52,   77,   70,   79,   52,   80,   85,   82,   87,
+       78,   82,   91,   89,  153,   82,   93,   93,   82,   94,
+      146,   94,   94,   95,   95,   80,   98,   98,  103,   80,
+       85,   89,   99,   99,   96,   87,   96,   96,   91,  100,
+      101,  100,  100,  117,  117,  103,  134,  101,  118,  118,
+      136,  137,  137,  138,  138,  145,  144,  142,  133,  130,
+
+      129,  128,  127,  125,  123,  122,  116,  113,  136,  134,
+      150,  150,  150,  150,  151,  151,  151,  151,  152,  152,
+      152,  152,  154,  154,  154,  154,  155,  112,  155,  155,
+      157,  157,  158,  158,  159,  159,  111,  110,  108,  106,
+      105,   97,   84,   81,   76,   75,   74,   73,   71,   67,
+       63,   62,   53,   48,   47,   46,   45,   43,   39,   22,
+       11,  149,  149,  149,  149,  149,  149,  149,  149,  149,
+      149,  149,  149,  149,  149,  149,  149,  149,  149,  149,
+      149,  149,  149,  149,  149,  149,  149,  149,  149,  149,
+      149,  149,  149,  149,  149,  149,  149,  149,  149,  149,
+
+      149,  149,  149,  149,  149,  149,  149,  149,  149,  149,
+      149,  149,  149,  149,  149
     } ;
 
 /* Table of booleans, true if rule could match eol. */
@@ -796,8 +799,8 @@ static const flex_int32_t yy_rule_can_match_eol[53] =
 #define yymore() (yyg->yy_more_flag = 1)
 #define YY_MORE_ADJ yyg->yy_more_len
 #define YY_RESTORE_YY_MORE_OFFSET
-#line 1 "guido.l"
-#line 10 "guido.l"
+#line 1 "src/engine/parser/guido.l"
+#line 10 "src/engine/parser/guido.l"
 
 
 #ifdef WIN32
@@ -875,9 +878,9 @@ static  char* unquote (char * str) {
 	return str;
 }
 
-#line 878 "guidolex.cpp"
+#line 881 "src/engine/parser/guidolex.cpp"
 
-#line 880 "guidolex.cpp"
+#line 883 "src/engine/parser/guidolex.cpp"
 
 #define INITIAL 0
 #define CMNTLN 1
@@ -910,8 +913,8 @@ struct yyguts_t
     size_t yy_buffer_stack_max; /**< capacity of stack. */
     YY_BUFFER_STATE * yy_buffer_stack; /**< Stack as an array. */
     char yy_hold_char;
-    int yy_n_chars;
-    int yyleng_r;
+    yy_size_t yy_n_chars;
+    yy_size_t yyleng_r;
     char *yy_c_buf_p;
     int yy_init;
     int yy_start;
@@ -968,7 +971,7 @@ FILE *yyget_out ( yyscan_t yyscanner );
 
 void yyset_out  ( FILE * _out_str , yyscan_t yyscanner );
 
-			int yyget_leng ( yyscan_t yyscanner );
+			yy_size_t yyget_leng ( yyscan_t yyscanner );
 
 char *yyget_text ( yyscan_t yyscanner );
 
@@ -1047,7 +1050,7 @@ static int input ( yyscan_t yyscanner );
 	if ( YY_CURRENT_BUFFER_LVALUE->yy_is_interactive ) \
 		{ \
 		int c = '*'; \
-		int n; \
+		yy_size_t n; \
 		for ( n = 0; n < max_size && \
 			     (c = getc( yyin )) != EOF && c != '\n'; ++n ) \
 			buf[n] = (char) c; \
@@ -1163,9 +1166,9 @@ YY_DECL
 		}
 
 	{
-#line 102 "guido.l"
+#line 102 "src/engine/parser/guido.l"
 
-#line 1168 "guidolex.cpp"
+#line 1171 "src/engine/parser/guidolex.cpp"
 
 	while ( /*CONSTCOND*/1 )		/* loops until end-of-file is reached */
 		{
@@ -1198,13 +1201,13 @@ YY_DECL
 			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 >= 148 )
+				if ( yy_current_state >= 150 )
 					yy_c = yy_meta[yy_c];
 				}
 			yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
 			++yy_cp;
 			}
-		while ( yy_current_state != 147 );
+		while ( yy_current_state != 149 );
 		yy_cp = yyg->yy_last_accepting_cpos;
 		yy_current_state = yyg->yy_last_accepting_state;
 
@@ -1215,7 +1218,7 @@ YY_DECL
 
 		if ( yy_act != YY_END_OF_BUFFER && yy_rule_can_match_eol[yy_act] )
 			{
-			int yyl;
+			yy_size_t yyl;
 			for ( yyl = yyg->yy_more_len; yyl < yyleng; ++yyl )
 				if ( yytext[yyl] == '\n' )
 					
@@ -1238,270 +1241,270 @@ YY_DECL
 
 case 1:
 YY_RULE_SETUP
-#line 103 "guido.l"
+#line 103 "src/engine/parser/guido.l"
 yyextra->fText = yytext; return NUMBER;
 	YY_BREAK
 case 2:
 YY_RULE_SETUP
-#line 104 "guido.l"
+#line 104 "src/engine/parser/guido.l"
 yyextra->fText = yytext; return PNUMBER;
 	YY_BREAK
 case 3:
 YY_RULE_SETUP
-#line 105 "guido.l"
+#line 105 "src/engine/parser/guido.l"
 yyextra->fText = yytext; return NNUMBER;
 	YY_BREAK
 case 4:
 YY_RULE_SETUP
-#line 107 "guido.l"
+#line 107 "src/engine/parser/guido.l"
 yyextra->fText = yytext; return FLOAT;
 	YY_BREAK
 case 5:
 YY_RULE_SETUP
-#line 108 "guido.l"
+#line 108 "src/engine/parser/guido.l"
 yyextra->fText = yytext; return FLOAT;
 	YY_BREAK
 case 6:
 YY_RULE_SETUP
-#line 109 "guido.l"
+#line 109 "src/engine/parser/guido.l"
 yyextra->fText = yytext; return FLOAT;
 	YY_BREAK
 case 7:
 YY_RULE_SETUP
-#line 111 "guido.l"
+#line 111 "src/engine/parser/guido.l"
 BEGIN CMNTLN;
 	YY_BREAK
 case 8:
 YY_RULE_SETUP
-#line 112 "guido.l"
+#line 112 "src/engine/parser/guido.l"
 
 	YY_BREAK
 case 9:
 /* rule 9 can match eol */
 YY_RULE_SETUP
-#line 113 "guido.l"
+#line 113 "src/engine/parser/guido.l"
 yylloc->first_column=0; BEGIN INITIAL;
 	YY_BREAK
 case 10:
 YY_RULE_SETUP
-#line 115 "guido.l"
+#line 115 "src/engine/parser/guido.l"
 nested=1; BEGIN COMMENT;
 	YY_BREAK
 case 11:
 /* rule 11 can match eol */
 YY_RULE_SETUP
-#line 116 "guido.l"
+#line 116 "src/engine/parser/guido.l"
 
 	YY_BREAK
 case 12:
 YY_RULE_SETUP
-#line 117 "guido.l"
+#line 117 "src/engine/parser/guido.l"
 nested++;
 	YY_BREAK
 case 13:
 YY_RULE_SETUP
-#line 118 "guido.l"
+#line 118 "src/engine/parser/guido.l"
 if (--nested==0) BEGIN INITIAL;
 	YY_BREAK
 case 14:
 YY_RULE_SETUP
-#line 120 "guido.l"
+#line 120 "src/engine/parser/guido.l"
 return STARTCHORD;
 	YY_BREAK
 case 15:
 YY_RULE_SETUP
-#line 121 "guido.l"
+#line 121 "src/engine/parser/guido.l"
 return ENDCHORD;
 	YY_BREAK
 case 16:
 YY_RULE_SETUP
-#line 122 "guido.l"
+#line 122 "src/engine/parser/guido.l"
 return SEP;
 	YY_BREAK
 case 17:
 YY_RULE_SETUP
-#line 123 "guido.l"
+#line 123 "src/engine/parser/guido.l"
 return IDSEP;
 	YY_BREAK
 case 18:
 YY_RULE_SETUP
-#line 124 "guido.l"
+#line 124 "src/engine/parser/guido.l"
 return STARTSEQ;
 	YY_BREAK
 case 19:
 YY_RULE_SETUP
-#line 125 "guido.l"
+#line 125 "src/engine/parser/guido.l"
 return ENDSEQ;
 	YY_BREAK
 case 20:
 YY_RULE_SETUP
-#line 126 "guido.l"
+#line 126 "src/engine/parser/guido.l"
 return STARTRANGE;
 	YY_BREAK
 case 21:
 YY_RULE_SETUP
-#line 127 "guido.l"
+#line 127 "src/engine/parser/guido.l"
 return ENDRANGE;
 	YY_BREAK
 case 22:
 YY_RULE_SETUP
-#line 128 "guido.l"
+#line 128 "src/engine/parser/guido.l"
 return BAR;
 	YY_BREAK
 case 23:
 YY_RULE_SETUP
-#line 130 "guido.l"
+#line 130 "src/engine/parser/guido.l"
 return DOT;
 	YY_BREAK
 case 24:
 YY_RULE_SETUP
-#line 131 "guido.l"
+#line 131 "src/engine/parser/guido.l"
 return DDOT;
 	YY_BREAK
 case 25:
 YY_RULE_SETUP
-#line 132 "guido.l"
+#line 132 "src/engine/parser/guido.l"
 return TDOT;
 	YY_BREAK
 case 26:
 YY_RULE_SETUP
-#line 133 "guido.l"
+#line 133 "src/engine/parser/guido.l"
 return SHARPT;
 	YY_BREAK
 case 27:
 YY_RULE_SETUP
-#line 134 "guido.l"
+#line 134 "src/engine/parser/guido.l"
 return FLATT;
 	YY_BREAK
 case 28:
 YY_RULE_SETUP
-#line 135 "guido.l"
+#line 135 "src/engine/parser/guido.l"
 return MULT;
 	YY_BREAK
 case 29:
 YY_RULE_SETUP
-#line 136 "guido.l"
+#line 136 "src/engine/parser/guido.l"
 return DIV;
 	YY_BREAK
 case 30:
 YY_RULE_SETUP
-#line 137 "guido.l"
+#line 137 "src/engine/parser/guido.l"
 return EQUAL;
 	YY_BREAK
 case 31:
 YY_RULE_SETUP
-#line 138 "guido.l"
+#line 138 "src/engine/parser/guido.l"
 return ENDVAR;			/* end of variable declaration */
 	YY_BREAK
 case 32:
 YY_RULE_SETUP
-#line 141 "guido.l"
+#line 141 "src/engine/parser/guido.l"
 return MLS;
 	YY_BREAK
 case 33:
 YY_RULE_SETUP
-#line 142 "guido.l"
+#line 142 "src/engine/parser/guido.l"
 return SEC;
 	YY_BREAK
 case 34:
 YY_RULE_SETUP
-#line 143 "guido.l"
+#line 143 "src/engine/parser/guido.l"
 yyextra->fText = yytext; return UNIT;
 	YY_BREAK
 case 35:
 YY_RULE_SETUP
-#line 146 "guido.l"
+#line 146 "src/engine/parser/guido.l"
 BEGIN PARAM; return STARTPARAM;
 	YY_BREAK
 case 36:
 YY_RULE_SETUP
-#line 147 "guido.l"
+#line 147 "src/engine/parser/guido.l"
 yyextra->fText = yytext; return IDT;
 	YY_BREAK
 case 37:
 YY_RULE_SETUP
-#line 148 "guido.l"
+#line 148 "src/engine/parser/guido.l"
 BEGIN INITIAL; return ENDPARAM;
 	YY_BREAK
 case 38:
 YY_RULE_SETUP
-#line 150 "guido.l"
+#line 150 "src/engine/parser/guido.l"
 yyextra->fText = yytext; return TAGNAME;
 	YY_BREAK
 case 39:
 YY_RULE_SETUP
-#line 152 "guido.l"
+#line 152 "src/engine/parser/guido.l"
 yyextra->fText = yytext; return VARNAME;
 	YY_BREAK
 case 40:
 YY_RULE_SETUP
-#line 155 "guido.l"
+#line 155 "src/engine/parser/guido.l"
 yyextra->fText = yytext; return SOLFEGE;
 	YY_BREAK
 case 41:
 YY_RULE_SETUP
-#line 156 "guido.l"
+#line 156 "src/engine/parser/guido.l"
 yyextra->fText = yytext; return CHROMATIC;
 	YY_BREAK
 case 42:
 YY_RULE_SETUP
-#line 157 "guido.l"
+#line 157 "src/engine/parser/guido.l"
 yyextra->fText = yytext; return DIATONIC;
 	YY_BREAK
 case 43:
 YY_RULE_SETUP
-#line 158 "guido.l"
+#line 158 "src/engine/parser/guido.l"
 yyextra->fText = yytext; return EMPTYT;
 	YY_BREAK
 case 44:
 YY_RULE_SETUP
-#line 159 "guido.l"
+#line 159 "src/engine/parser/guido.l"
 yyextra->fText = yytext; return TAB;
 	YY_BREAK
 case 45:
 YY_RULE_SETUP
-#line 160 "guido.l"
+#line 160 "src/engine/parser/guido.l"
 return RESTT;
 	YY_BREAK
 case 46:
 /* rule 46 can match eol */
 YY_RULE_SETUP
-#line 162 "guido.l"
+#line 162 "src/engine/parser/guido.l"
 unescape(yytext); unquote(yytext); yyextra->fText = yytext; return STRING;
 	YY_BREAK
 case 47:
 /* rule 47 can match eol */
 YY_RULE_SETUP
-#line 163 "guido.l"
+#line 163 "src/engine/parser/guido.l"
 unescape(yytext); unquote(yytext); yyextra->fText = yytext; return STRING;
 	YY_BREAK
 case 48:
 YY_RULE_SETUP
-#line 164 "guido.l"
+#line 164 "src/engine/parser/guido.l"
 unescape(yytext); unquote(yytext); yyextra->fText = yytext; return FRETTE;
 	YY_BREAK
 case 49:
 YY_RULE_SETUP
-#line 166 "guido.l"
+#line 166 "src/engine/parser/guido.l"
 /* eat up space */
 	YY_BREAK
 case 50:
 /* rule 50 can match eol */
 YY_RULE_SETUP
-#line 168 "guido.l"
+#line 168 "src/engine/parser/guido.l"
 yylloc->first_column=1; /* ignore */
 	YY_BREAK
 case 51:
 YY_RULE_SETUP
-#line 170 "guido.l"
+#line 170 "src/engine/parser/guido.l"
 fprintf(stderr, "extra text is : %s\n", yytext); return EXTRA;
 	YY_BREAK
 case 52:
 YY_RULE_SETUP
-#line 172 "guido.l"
+#line 172 "src/engine/parser/guido.l"
 ECHO;
 	YY_BREAK
-#line 1504 "guidolex.cpp"
+#line 1507 "src/engine/parser/guidolex.cpp"
 case YY_STATE_EOF(INITIAL):
 case YY_STATE_EOF(CMNTLN):
 case YY_STATE_EOF(COMMENT):
@@ -1694,7 +1697,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 
 	else
 		{
-			int num_to_read =
+			yy_size_t num_to_read =
 			YY_CURRENT_BUFFER_LVALUE->yy_buf_size - number_to_move - 1;
 
 		while ( num_to_read <= 0 )
@@ -1708,7 +1711,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 
 			if ( b->yy_is_our_buffer )
 				{
-				int new_size = b->yy_buf_size * 2;
+				yy_size_t new_size = b->yy_buf_size * 2;
 
 				if ( new_size <= 0 )
 					b->yy_buf_size += b->yy_buf_size / 8;
@@ -1766,7 +1769,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 
 	if ((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. */
-		int new_size = yyg->yy_n_chars + number_to_move + (yyg->yy_n_chars >> 1);
+		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, (yy_size_t) new_size , yyscanner );
 		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
@@ -1805,7 +1808,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 		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 >= 148 )
+			if ( yy_current_state >= 150 )
 				yy_c = yy_meta[yy_c];
 			}
 		yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
@@ -1834,11 +1837,11 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 	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 >= 148 )
+		if ( yy_current_state >= 150 )
 			yy_c = yy_meta[yy_c];
 		}
 	yy_current_state = yy_nxt[yy_base[yy_current_state] + yy_c];
-	yy_is_jam = (yy_current_state == 147);
+	yy_is_jam = (yy_current_state == 149);
 
 	(void)yyg;
 	return yy_is_jam ? 0 : yy_current_state;
@@ -1873,7 +1876,7 @@ static int yy_get_next_buffer (yyscan_t yyscanner)
 
 		else
 			{ /* need more input */
-			int offset = (int) (yyg->yy_c_buf_p - yyg->yytext_ptr);
+			yy_size_t offset = yyg->yy_c_buf_p - yyg->yytext_ptr;
 			++yyg->yy_c_buf_p;
 
 			switch ( yy_get_next_buffer( yyscanner ) )
@@ -2258,12 +2261,12 @@ YY_BUFFER_STATE yy_scan_string (const char * yystr , yyscan_t yyscanner)
  * @param yyscanner The scanner object.
  * @return the newly allocated buffer state object.
  */
-YY_BUFFER_STATE yy_scan_bytes  (const char * yybytes, int  _yybytes_len , yyscan_t yyscanner)
+YY_BUFFER_STATE yy_scan_bytes  (const char * yybytes, yy_size_t  _yybytes_len , yyscan_t yyscanner)
 {
 	YY_BUFFER_STATE b;
 	char *buf;
 	yy_size_t n;
-	int i;
+	yy_size_t i;
     
 	/* Get memory for full buffer, including space for trailing EOB's. */
 	n = (yy_size_t) (_yybytes_len + 2);
@@ -2307,7 +2310,7 @@ static void yynoreturn yy_fatal_error (const char* msg , yyscan_t yyscanner)
 	do \
 		{ \
 		/* Undo effects of setting up yytext. */ \
-        int yyless_macro_arg = (n); \
+        yy_size_t 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; \
@@ -2375,7 +2378,7 @@ FILE *yyget_out  (yyscan_t yyscanner)
 /** Get the length of the current token.
  * @param yyscanner The scanner object.
  */
-int yyget_leng  (yyscan_t yyscanner)
+yy_size_t yyget_leng  (yyscan_t yyscanner)
 {
     struct yyguts_t * yyg = (struct yyguts_t*)yyscanner;
     return yyleng;
@@ -2668,7 +2671,7 @@ void yyfree (void * ptr , yyscan_t yyscanner)
 
 #define YYTABLES_NAME "yytables"
 
-#line 172 "guido.l"
+#line 172 "src/engine/parser/guido.l"
 
 
 void GuidoParser::initScanner()