update ds9 parsers

145 files changed, 125 insertions, 147 deletions

diff --git a/ds9/parsers/alignparser.tac b/ds9/parsers/alignparser.tac
index d95f941..d2a9ad0 100644
--- a/ds9/parsers/alignparser.tac
+++ b/ds9/parsers/alignparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/analysisparser.tac b/ds9/parsers/analysisparser.tac
index 5975706..46330ab 100644
--- a/ds9/parsers/analysisparser.tac
+++ b/ds9/parsers/analysisparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include int.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/analysissendparser.tac b/ds9/parsers/analysissendparser.tac
index 02657c6..23b9bef 100644
--- a/ds9/parsers/analysissendparser.tac
+++ b/ds9/parsers/analysissendparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
 
 %start analysissend
 
diff --git a/ds9/parsers/arrayparser.tac b/ds9/parsers/arrayparser.tac
index 02e247a..cdf5d56 100644
--- a/ds9/parsers/arrayparser.tac
+++ b/ds9/parsers/arrayparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/backupparser.tac b/ds9/parsers/backupparser.tac
index 55f153a..ff68658 100644
--- a/ds9/parsers/backupparser.tac
+++ b/ds9/parsers/backupparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/bgparser.tac b/ds9/parsers/bgparser.tac
index 031f48b..b28a554 100644
--- a/ds9/parsers/bgparser.tac
+++ b/ds9/parsers/bgparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/binparser.tac b/ds9/parsers/binparser.tac
index ba7ab00..ca2ffef 100644
--- a/ds9/parsers/binparser.tac
+++ b/ds9/parsers/binparser.tac
@@ -1,11 +1,10 @@
 %{
 %}
-
 #include def.tin
+
 #include yesno.tin
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/binsendparser.tac b/ds9/parsers/binsendparser.tac
index fe941cf..ebe2961 100644
--- a/ds9/parsers/binsendparser.tac
+++ b/ds9/parsers/binsendparser.tac
@@ -1,6 +1,5 @@
 %{
 %}
-
 #include def.tin
 
 %start binsend
diff --git a/ds9/parsers/blinkparser.tac b/ds9/parsers/blinkparser.tac
index 67acbdc..b1fe6d7 100644
--- a/ds9/parsers/blinkparser.tac
+++ b/ds9/parsers/blinkparser.tac
@@ -1,10 +1,10 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/blinksendparser.tac b/ds9/parsers/blinksendparser.tac
index 3700b1b..3218bd2 100644
--- a/ds9/parsers/blinksendparser.tac
+++ b/ds9/parsers/blinksendparser.tac
@@ -1,6 +1,5 @@
 %{
 %}
-
 #include def.tin
 
 %start blinksend
diff --git a/ds9/parsers/blockparser.tac b/ds9/parsers/blockparser.tac
index aa13441..cbb07d9 100644
--- a/ds9/parsers/blockparser.tac
+++ b/ds9/parsers/blockparser.tac
@@ -1,10 +1,10 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/blocksendparser.tac b/ds9/parsers/blocksendparser.tac
index 7ae14c1..87f4680 100644
--- a/ds9/parsers/blocksendparser.tac
+++ b/ds9/parsers/blocksendparser.tac
@@ -1,6 +1,5 @@
 %{
 %}
-
 #include def.tin
 
 %start blocksend
diff --git a/ds9/parsers/catparser.tac b/ds9/parsers/catparser.tac
index 8c52c03..d2d23d8 100644
--- a/ds9/parsers/catparser.tac
+++ b/ds9/parsers/catparser.tac
@@ -1,5 +1,6 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include fonts.tin
@@ -9,7 +10,6 @@
 #include numeric.tin
 #include sexstr.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/catsendparser.tac b/ds9/parsers/catsendparser.tac
index aa1d72c..ea29ba8 100644
--- a/ds9/parsers/catsendparser.tac
+++ b/ds9/parsers/catsendparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
 
 %start catsend
 
diff --git a/ds9/parsers/cmapparser.tac b/ds9/parsers/cmapparser.tac
index eae7fca..5726e03 100644
--- a/ds9/parsers/cmapparser.tac
+++ b/ds9/parsers/cmapparser.tac
@@ -1,10 +1,10 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/cmapsendparser.tac b/ds9/parsers/cmapsendparser.tac
index 19658c0..522501f 100644
--- a/ds9/parsers/cmapsendparser.tac
+++ b/ds9/parsers/cmapsendparser.tac
@@ -1,6 +1,5 @@
 %{
 %}
-
 #include def.tin
 
 %start cmapsend
diff --git a/ds9/parsers/colorbarparser.tac b/ds9/parsers/colorbarparser.tac
index ace5c2c..b0180b0 100644
--- a/ds9/parsers/colorbarparser.tac
+++ b/ds9/parsers/colorbarparser.tac
@@ -1,11 +1,11 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include fonts.tin
 #include int.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/colorbarsendparser.tac b/ds9/parsers/colorbarsendparser.tac
index e92959f..42ab3cc 100644
--- a/ds9/parsers/colorbarsendparser.tac
+++ b/ds9/parsers/colorbarsendparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include font.tin
-#include def.tin
 
 %start colorbarsend
 
diff --git a/ds9/parsers/contourparser.tac b/ds9/parsers/contourparser.tac
index 450f92b..5ff8313 100644
--- a/ds9/parsers/contourparser.tac
+++ b/ds9/parsers/contourparser.tac
@@ -1,5 +1,6 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include coordsys.tin
@@ -7,7 +8,6 @@
 #include skyframe.tin
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/contoursendparser.tac b/ds9/parsers/contoursendparser.tac
index 3717839..18c2506 100644
--- a/ds9/parsers/contoursendparser.tac
+++ b/ds9/parsers/contoursendparser.tac
@@ -1,10 +1,10 @@
 %{
 %}
+#include def.tin
 
 #include coordsys.tin
 #include wcssys.tin
 #include skyframe.tin
-#include def.tin
 
 %start contoursend
 
diff --git a/ds9/parsers/cropparser.tac b/ds9/parsers/cropparser.tac
index 5ba562c..371c2cd 100644
--- a/ds9/parsers/cropparser.tac
+++ b/ds9/parsers/cropparser.tac
@@ -1,5 +1,6 @@
 %{
 %}
+#include def.tin
 
 #include coordsys.tin
 #include wcssys.tin
@@ -8,7 +9,6 @@
 #include numeric.tin
 #include sexstr.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/cropsendparser.tac b/ds9/parsers/cropsendparser.tac
index 9f7793c..c89fec8 100644
--- a/ds9/parsers/cropsendparser.tac
+++ b/ds9/parsers/cropsendparser.tac
@@ -1,11 +1,11 @@
 %{
 %}
+#include def.tin
 
 #include coordsys.tin
 #include wcssys.tin
 #include skyframe.tin
 #include wcsformat.tin
-#include def.tin
 
 %start cropsend
 
diff --git a/ds9/parsers/crosshairparser.tac b/ds9/parsers/crosshairparser.tac
index 62c0ae3..8becaec 100644
--- a/ds9/parsers/crosshairparser.tac
+++ b/ds9/parsers/crosshairparser.tac
@@ -1,5 +1,6 @@
 %{
 %}
+#include def.tin
 
 #include coordsys.tin
 #include wcssys.tin
@@ -7,7 +8,6 @@
 #include numeric.tin
 #include sexstr.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/crosshairsendparser.tac b/ds9/parsers/crosshairsendparser.tac
index 1bd0e05..8e7d6ac 100644
--- a/ds9/parsers/crosshairsendparser.tac
+++ b/ds9/parsers/crosshairsendparser.tac
@@ -1,11 +1,11 @@
 %{
 %}
+#include def.tin
 
 #include coordsys.tin
 #include wcssys.tin
 #include skyframe.tin
 #include skyformat.tin
-#include def.tin
 
 %start crosshairsend
 
diff --git a/ds9/parsers/cubeparser.tac b/ds9/parsers/cubeparser.tac
index 78e2f84..d749b6e 100644
--- a/ds9/parsers/cubeparser.tac
+++ b/ds9/parsers/cubeparser.tac
@@ -1,11 +1,11 @@
 %{
 %}
+#include def.tin
 
 #include wcssys.tin
 #include yesno.tin
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/cubesendparser.tac b/ds9/parsers/cubesendparser.tac
index f4835eb..e79c850 100644
--- a/ds9/parsers/cubesendparser.tac
+++ b/ds9/parsers/cubesendparser.tac
@@ -1,6 +1,5 @@
 %{
 %}
-
 #include def.tin
 
 %start cubesend
diff --git a/ds9/parsers/cursorparser.tac b/ds9/parsers/cursorparser.tac
index f184ea8..d3f6552 100644
--- a/ds9/parsers/cursorparser.tac
+++ b/ds9/parsers/cursorparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include int.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/datasendparser.tac b/ds9/parsers/datasendparser.tac
index dce475e..79f2aaf 100644
--- a/ds9/parsers/datasendparser.tac
+++ b/ds9/parsers/datasendparser.tac
@@ -1,5 +1,6 @@
 %{
 %}
+#include def.tin
 
 #include coordsys.tin
 #include wcssys.tin
@@ -7,7 +8,6 @@
 #include yesno.tin
 #include numeric.tin
 #include sexstr.tin
-#include def.tin
 
 %start datasend
 
diff --git a/ds9/parsers/dssesoparser.tac b/ds9/parsers/dssesoparser.tac
index ca36e79..e415992 100644
--- a/ds9/parsers/dssesoparser.tac
+++ b/ds9/parsers/dssesoparser.tac
@@ -1,11 +1,11 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include imgsvr.tin
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/dssesosendparser.tac b/ds9/parsers/dssesosendparser.tac
index 951d4b2..ff54e57 100644
--- a/ds9/parsers/dssesosendparser.tac
+++ b/ds9/parsers/dssesosendparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include imgsvrsend.tin
-#include def.tin
 
 %start dssesosend
 
diff --git a/ds9/parsers/dsssaoparser.tac b/ds9/parsers/dsssaoparser.tac
index 0c867aa..5858711 100644
--- a/ds9/parsers/dsssaoparser.tac
+++ b/ds9/parsers/dsssaoparser.tac
@@ -1,11 +1,11 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include imgsvr.tin
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/dsssaosendparser.tac b/ds9/parsers/dsssaosendparser.tac
index b485c09..ecb06d1 100644
--- a/ds9/parsers/dsssaosendparser.tac
+++ b/ds9/parsers/dsssaosendparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include imgsvrsend.tin
-#include def.tin
 
 %start dsssaosend
 
diff --git a/ds9/parsers/dssstsciparser.tac b/ds9/parsers/dssstsciparser.tac
index c74c954..df96d69 100644
--- a/ds9/parsers/dssstsciparser.tac
+++ b/ds9/parsers/dssstsciparser.tac
@@ -1,11 +1,11 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include imgsvr.tin
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/dssstscisendparser.tac b/ds9/parsers/dssstscisendparser.tac
index b6c2c89..6908c93 100644
--- a/ds9/parsers/dssstscisendparser.tac
+++ b/ds9/parsers/dssstscisendparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include imgsvrsend.tin
-#include def.tin
 
 %start dssstscisend
 
diff --git a/ds9/parsers/enviparser.tac b/ds9/parsers/enviparser.tac
index bb627d8..c58a9ca 100644
--- a/ds9/parsers/enviparser.tac
+++ b/ds9/parsers/enviparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/exportparser.tac b/ds9/parsers/exportparser.tac
index 5ea9e16..3d066f2 100644
--- a/ds9/parsers/exportparser.tac
+++ b/ds9/parsers/exportparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/fitsparser.tac b/ds9/parsers/fitsparser.tac
index 02e260d..8c13b50 100644
--- a/ds9/parsers/fitsparser.tac
+++ b/ds9/parsers/fitsparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/fitssendparser.tac b/ds9/parsers/fitssendparser.tac
index 4d7bd1f..8f594e3 100644
--- a/ds9/parsers/fitssendparser.tac
+++ b/ds9/parsers/fitssendparser.tac
@@ -1,12 +1,12 @@
 %{
 %}
+#include def.tin
 
 #include wcssys.tin
 #include skyframe.tin
 #include rformat.tin
 #include int.tin
 #include string.tin
-#include def.tin
 
 %start fitssend
 
diff --git a/ds9/parsers/frameparser.tac b/ds9/parsers/frameparser.tac
index 3932d70..27aa32c 100644
--- a/ds9/parsers/frameparser.tac
+++ b/ds9/parsers/frameparser.tac
@@ -1,11 +1,11 @@
 %{
 %}
+#include def.tin
 
 #include coordsys.tin
 #include wcssys.tin
 #include int.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/framesendparser.tac b/ds9/parsers/framesendparser.tac
index a2d3c48..4390e0d 100644
--- a/ds9/parsers/framesendparser.tac
+++ b/ds9/parsers/framesendparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include coordsys.tin
 #include wcssys.tin
-#include def.tin
 
 %start framesend
 
diff --git a/ds9/parsers/gridparser.tac b/ds9/parsers/gridparser.tac
index dff1eb3..c9aaa77 100644
--- a/ds9/parsers/gridparser.tac
+++ b/ds9/parsers/gridparser.tac
@@ -1,5 +1,6 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include fonts.tin
@@ -9,7 +10,6 @@
 #include skyformat.tin
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/gridsendparser.tac b/ds9/parsers/gridsendparser.tac
index 05ecb35..4f1d0dc 100644
--- a/ds9/parsers/gridsendparser.tac
+++ b/ds9/parsers/gridsendparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include font.tin
-#include def.tin
 
 %start gridsend
 
diff --git a/ds9/parsers/headerparser.tac b/ds9/parsers/headerparser.tac
index a32a155..3690b0d 100644
--- a/ds9/parsers/headerparser.tac
+++ b/ds9/parsers/headerparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include int.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/heightparser.tac b/ds9/parsers/heightparser.tac
index af160bc..620c5df 100644
--- a/ds9/parsers/heightparser.tac
+++ b/ds9/parsers/heightparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include int.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/iconifyparser.tac b/ds9/parsers/iconifyparser.tac
index 5733fb5..52e1a84 100644
--- a/ds9/parsers/iconifyparser.tac
+++ b/ds9/parsers/iconifyparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/iexamsendparser.tac b/ds9/parsers/iexamsendparser.tac
index a9e9c6e..7ce68aa 100644
--- a/ds9/parsers/iexamsendparser.tac
+++ b/ds9/parsers/iexamsendparser.tac
@@ -1,5 +1,6 @@
 %{
 %}
+#include def.tin
 
 #include coordsys.tin
 #include wcssys.tin
@@ -7,7 +8,6 @@
 #include skyformat.tin
 #include string.tin
 #include int.tin
-#include def.tin
 
 %start iexamsend
 
diff --git a/ds9/parsers/iisparser.tac b/ds9/parsers/iisparser.tac
index c87d965..7200bfe 100644
--- a/ds9/parsers/iisparser.tac
+++ b/ds9/parsers/iisparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include int.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/iissendparser.tac b/ds9/parsers/iissendparser.tac
index 6cca426..541aa30 100644
--- a/ds9/parsers/iissendparser.tac
+++ b/ds9/parsers/iissendparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include int.tin
-#include def.tin
 
 %start iissend
 
diff --git a/ds9/parsers/int.tin b/ds9/parsers/int.tin
index 40ff7f2..57d39bc 100644
--- a/ds9/parsers/int.tin
+++ b/ds9/parsers/int.tin
@@ -1 +1 @@
-%token INT_
+%token INT_ integer
diff --git a/ds9/parsers/lockparser.tac b/ds9/parsers/lockparser.tac
index 4fb4932..91612dc 100644
--- a/ds9/parsers/lockparser.tac
+++ b/ds9/parsers/lockparser.tac
@@ -1,11 +1,11 @@
 %{
 %}
+#include def.tin
 
 #include coordsys.tin
 #include wcssys.tin
 #include yesno.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/locksendparser.tac b/ds9/parsers/locksendparser.tac
index cd6b1c5..3dfc4f8 100644
--- a/ds9/parsers/locksendparser.tac
+++ b/ds9/parsers/locksendparser.tac
@@ -1,6 +1,5 @@
 %{
 %}
-
 #include def.tin
 
 %start locksend
diff --git a/ds9/parsers/magnifierparser.tac b/ds9/parsers/magnifierparser.tac
index 55cabb8..0fe16c9 100644
--- a/ds9/parsers/magnifierparser.tac
+++ b/ds9/parsers/magnifierparser.tac
@@ -1,10 +1,10 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/magnifiersendparser.tac b/ds9/parsers/magnifiersendparser.tac
index d1dc1e2..d914e84 100644
--- a/ds9/parsers/magnifiersendparser.tac
+++ b/ds9/parsers/magnifiersendparser.tac
@@ -1,6 +1,5 @@
 %{
 %}
-
 #include def.tin
 
 %start magnifiersend
diff --git a/ds9/parsers/maskparser.tac b/ds9/parsers/maskparser.tac
index 532c41b..f7a3376 100644
--- a/ds9/parsers/maskparser.tac
+++ b/ds9/parsers/maskparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include int.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/masksendparser.tac b/ds9/parsers/masksendparser.tac
index 4c52e71..bfb4f8a 100644
--- a/ds9/parsers/masksendparser.tac
+++ b/ds9/parsers/masksendparser.tac
@@ -1,6 +1,5 @@
 %{
 %}
-
 #include def.tin
 
 %start masksend
diff --git a/ds9/parsers/matchparser.tac b/ds9/parsers/matchparser.tac
index c2bd254..e88841a 100644
--- a/ds9/parsers/matchparser.tac
+++ b/ds9/parsers/matchparser.tac
@@ -1,10 +1,10 @@
 %{
 %}
+#include def.tin
 
 #include coordsys.tin
 #include wcssys.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/mecubeparser.tac b/ds9/parsers/mecubeparser.tac
index e7f17de..0f8ca9a 100644
--- a/ds9/parsers/mecubeparser.tac
+++ b/ds9/parsers/mecubeparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/minmaxparser.tac b/ds9/parsers/minmaxparser.tac
index 2fc1c35..c9a93e4 100644
--- a/ds9/parsers/minmaxparser.tac
+++ b/ds9/parsers/minmaxparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include int.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/minmaxsendparser.tac b/ds9/parsers/minmaxsendparser.tac
index 70b89d8..44afe40d 100644
--- a/ds9/parsers/minmaxsendparser.tac
+++ b/ds9/parsers/minmaxsendparser.tac
@@ -1,6 +1,5 @@
 %{
 %}
-
 #include def.tin
 
 %start minmaxsend
diff --git a/ds9/parsers/modeparser.tac b/ds9/parsers/modeparser.tac
index ece3921..7f1520c 100644
--- a/ds9/parsers/modeparser.tac
+++ b/ds9/parsers/modeparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/mosaicimageirafparser.tac b/ds9/parsers/mosaicimageirafparser.tac
index 830b61f..1b78503 100644
--- a/ds9/parsers/mosaicimageirafparser.tac
+++ b/ds9/parsers/mosaicimageirafparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/mosaicimagewcsparser.tac b/ds9/parsers/mosaicimagewcsparser.tac
index b61b41f..00a37b3 100644
--- a/ds9/parsers/mosaicimagewcsparser.tac
+++ b/ds9/parsers/mosaicimagewcsparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include wcssys.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/mosaicimagewfpc2parser.tac b/ds9/parsers/mosaicimagewfpc2parser.tac
index 7d060c8..88030fd 100644
--- a/ds9/parsers/mosaicimagewfpc2parser.tac
+++ b/ds9/parsers/mosaicimagewfpc2parser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/mosaicirafparser.tac b/ds9/parsers/mosaicirafparser.tac
index 3beaea6..a61e2ab 100644
--- a/ds9/parsers/mosaicirafparser.tac
+++ b/ds9/parsers/mosaicirafparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/mosaicwcsparser.tac b/ds9/parsers/mosaicwcsparser.tac
index f2dd710..1261778 100644
--- a/ds9/parsers/mosaicwcsparser.tac
+++ b/ds9/parsers/mosaicwcsparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include wcssys.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/movieparser.tac b/ds9/parsers/movieparser.tac
index d5152a5..b9ab487 100644
--- a/ds9/parsers/movieparser.tac
+++ b/ds9/parsers/movieparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/multiframeparser.tac b/ds9/parsers/multiframeparser.tac
index 86452ae..2bfe922 100644
--- a/ds9/parsers/multiframeparser.tac
+++ b/ds9/parsers/multiframeparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/nanparser.tac b/ds9/parsers/nanparser.tac
index de67d02..11ecacc 100644
--- a/ds9/parsers/nanparser.tac
+++ b/ds9/parsers/nanparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/nresparser.tac b/ds9/parsers/nresparser.tac
index b9390c3..9f68a9c 100644
--- a/ds9/parsers/nresparser.tac
+++ b/ds9/parsers/nresparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/nressendparser.tac b/ds9/parsers/nressendparser.tac
index 8ca8a54..40404a2 100644
--- a/ds9/parsers/nressendparser.tac
+++ b/ds9/parsers/nressendparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
 
 %start nressend
 
diff --git a/ds9/parsers/nrrdparser.tac b/ds9/parsers/nrrdparser.tac
index be49ed7..9653685 100644
--- a/ds9/parsers/nrrdparser.tac
+++ b/ds9/parsers/nrrdparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/numeric.tin b/ds9/parsers/numeric.tin
index 95ac7f9..918879d 100644
--- a/ds9/parsers/numeric.tin
+++ b/ds9/parsers/numeric.tin
@@ -1,2 +1,2 @@
-%token INT_
-%token REAL_
+%token INT_ integer
+%token REAL_ float
diff --git a/ds9/parsers/nvssparser.tac b/ds9/parsers/nvssparser.tac
index 155a5b2..5c0efaf 100644
--- a/ds9/parsers/nvssparser.tac
+++ b/ds9/parsers/nvssparser.tac
@@ -1,11 +1,11 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include imgsvr.tin
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/nvsssendparser.tac b/ds9/parsers/nvsssendparser.tac
index f1ed118..fe5fe72 100644
--- a/ds9/parsers/nvsssendparser.tac
+++ b/ds9/parsers/nvsssendparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include imgsvrsend.tin
-#include def.tin
 
 %start nvsssend
 
diff --git a/ds9/parsers/orientparser.tac b/ds9/parsers/orientparser.tac
index 1c783e1..7f06631 100644
--- a/ds9/parsers/orientparser.tac
+++ b/ds9/parsers/orientparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/pagesetupparser.tac b/ds9/parsers/pagesetupparser.tac
index 0cd81fb..20d7451 100644
--- a/ds9/parsers/pagesetupparser.tac
+++ b/ds9/parsers/pagesetupparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/pagesetupsendparser.tac b/ds9/parsers/pagesetupsendparser.tac
index 19149d6..7507166 100644
--- a/ds9/parsers/pagesetupsendparser.tac
+++ b/ds9/parsers/pagesetupsendparser.tac
@@ -1,6 +1,5 @@
 %{
 %}
-
 #include def.tin
 
 %start pagesetupsend
diff --git a/ds9/parsers/panparser.tac b/ds9/parsers/panparser.tac
index 5337c8e..7d6c812 100644
--- a/ds9/parsers/panparser.tac
+++ b/ds9/parsers/panparser.tac
@@ -1,5 +1,6 @@
 %{
 %}
+#include def.tin
 
 #include coordsys.tin
 #include wcssys.tin
@@ -7,7 +8,6 @@
 #include numeric.tin
 #include sexstr.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/pansendparser.tac b/ds9/parsers/pansendparser.tac
index e5f8db6..c42e368 100644
--- a/ds9/parsers/pansendparser.tac
+++ b/ds9/parsers/pansendparser.tac
@@ -1,11 +1,11 @@
 %{
 %}
+#include def.tin
 
 #include coordsys.tin
 #include wcssys.tin
 #include skyframe.tin
 #include skyformat.tin
-#include def.tin
 
 %start pansend
 
diff --git a/ds9/parsers/photoparser.tac b/ds9/parsers/photoparser.tac
index d8b914c..6da6e56 100644
--- a/ds9/parsers/photoparser.tac
+++ b/ds9/parsers/photoparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/pixeltableparser.tac b/ds9/parsers/pixeltableparser.tac
index 1990e71..5f48ed5 100644
--- a/ds9/parsers/pixeltableparser.tac
+++ b/ds9/parsers/pixeltableparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/plotparser.tac b/ds9/parsers/plotparser.tac
index e88d723..6401728 100644
--- a/ds9/parsers/plotparser.tac
+++ b/ds9/parsers/plotparser.tac
@@ -1,12 +1,12 @@
 
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include fonts.tin
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/plotsendparser.tac b/ds9/parsers/plotsendparser.tac
index 0f5919c..8c72e9d 100644
--- a/ds9/parsers/plotsendparser.tac
+++ b/ds9/parsers/plotsendparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include font.tin
 #include string.tin
-#include def.tin
 
 %start plotsend
 
diff --git a/ds9/parsers/precisionparser.tac b/ds9/parsers/precisionparser.tac
index 249a997..62772ec 100644
--- a/ds9/parsers/precisionparser.tac
+++ b/ds9/parsers/precisionparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include int.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/prefsparser.tac b/ds9/parsers/prefsparser.tac
index b65623c..749d43f 100644
--- a/ds9/parsers/prefsparser.tac
+++ b/ds9/parsers/prefsparser.tac
@@ -1,10 +1,10 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include int.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/prefssendparser.tac b/ds9/parsers/prefssendparser.tac
index 6b123cb..4a4e8a7 100644
--- a/ds9/parsers/prefssendparser.tac
+++ b/ds9/parsers/prefssendparser.tac
@@ -1,6 +1,5 @@
 %{
 %}
-
 #include def.tin
 
 %start prefssend
diff --git a/ds9/parsers/preserveparser.tac b/ds9/parsers/preserveparser.tac
index eb9fbe3..1ffe15e 100644
--- a/ds9/parsers/preserveparser.tac
+++ b/ds9/parsers/preserveparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/preservesendparser.tac b/ds9/parsers/preservesendparser.tac
index 0ca2863..80155c7 100644
--- a/ds9/parsers/preservesendparser.tac
+++ b/ds9/parsers/preservesendparser.tac
@@ -1,6 +1,5 @@
 %{
 %}
-
 #include def.tin
 
 %start preservesend
diff --git a/ds9/parsers/psparser.tac b/ds9/parsers/psparser.tac
index 694e442..faee8cd 100644
--- a/ds9/parsers/psparser.tac
+++ b/ds9/parsers/psparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/pssendparser.tac b/ds9/parsers/pssendparser.tac
index a83b3e5..d87b967 100644
--- a/ds9/parsers/pssendparser.tac
+++ b/ds9/parsers/pssendparser.tac
@@ -1,6 +1,5 @@
 %{
 %}
-
 #include def.tin
 
 %start pssend
diff --git a/ds9/parsers/regionparser.tac b/ds9/parsers/regionparser.tac
index cf2ab54..5663bb0 100644
--- a/ds9/parsers/regionparser.tac
+++ b/ds9/parsers/regionparser.tac
@@ -1,5 +1,6 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include coordsys.tin
@@ -8,7 +9,6 @@
 #include skyformat.tin
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/regionsendparser.tac b/ds9/parsers/regionsendparser.tac
index 8681ed1..04fe455 100644
--- a/ds9/parsers/regionsendparser.tac
+++ b/ds9/parsers/regionsendparser.tac
@@ -1,5 +1,6 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include coordsys.tin
@@ -8,7 +9,6 @@
 #include skyformat.tin
 #include int.tin
 #include string.tin
-#include def.tin
 
 %start regionsend
 
diff --git a/ds9/parsers/restoreparser.tac b/ds9/parsers/restoreparser.tac
index 2f6b840..ad3c301 100644
--- a/ds9/parsers/restoreparser.tac
+++ b/ds9/parsers/restoreparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/rgbarrayparser.tac b/ds9/parsers/rgbarrayparser.tac
index e6a6762..0acedc8 100644
--- a/ds9/parsers/rgbarrayparser.tac
+++ b/ds9/parsers/rgbarrayparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/rgbcubeparser.tac b/ds9/parsers/rgbcubeparser.tac
index f5aaddd..86e0a7e 100644
--- a/ds9/parsers/rgbcubeparser.tac
+++ b/ds9/parsers/rgbcubeparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/rgbimageparser.tac b/ds9/parsers/rgbimageparser.tac
index bda324a..f52ca3e 100644
--- a/ds9/parsers/rgbimageparser.tac
+++ b/ds9/parsers/rgbimageparser.tac
@@ -1,8 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
+
 
 %start command
 
diff --git a/ds9/parsers/rgbparser.tac b/ds9/parsers/rgbparser.tac
index 6c23297..7b4171e 100644
--- a/ds9/parsers/rgbparser.tac
+++ b/ds9/parsers/rgbparser.tac
@@ -1,10 +1,10 @@
 %{
 %}
+#include def.tin
 
 #include wcssys.tin
 #include yesno.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/rgbsendparser.tac b/ds9/parsers/rgbsendparser.tac
index c3cb5c1..766a826 100644
--- a/ds9/parsers/rgbsendparser.tac
+++ b/ds9/parsers/rgbsendparser.tac
@@ -1,6 +1,5 @@
 %{
 %}
-
 #include def.tin
 
 %start rgbsend
diff --git a/ds9/parsers/rotateparser.tac b/ds9/parsers/rotateparser.tac
index 82c25bd..1a02632 100644
--- a/ds9/parsers/rotateparser.tac
+++ b/ds9/parsers/rotateparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/sampparser.tac b/ds9/parsers/sampparser.tac
index d7913c8..5947cfa 100644
--- a/ds9/parsers/sampparser.tac
+++ b/ds9/parsers/sampparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/saveimageparser.tac b/ds9/parsers/saveimageparser.tac
index 216d84f..890c080 100644
--- a/ds9/parsers/saveimageparser.tac
+++ b/ds9/parsers/saveimageparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/saveparser.tac b/ds9/parsers/saveparser.tac
index 54c9df6..f75d51c 100644
--- a/ds9/parsers/saveparser.tac
+++ b/ds9/parsers/saveparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include int.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/scaleparser.tac b/ds9/parsers/scaleparser.tac
index 1e7541b..a4039c8 100644
--- a/ds9/parsers/scaleparser.tac
+++ b/ds9/parsers/scaleparser.tac
@@ -1,10 +1,10 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/scalesendparser.tac b/ds9/parsers/scalesendparser.tac
index bd25abd..9436518 100644
--- a/ds9/parsers/scalesendparser.tac
+++ b/ds9/parsers/scalesendparser.tac
@@ -1,6 +1,5 @@
 %{
 %}
-
 #include def.tin
 
 %start scalesend
diff --git a/ds9/parsers/sexstr.tin b/ds9/parsers/sexstr.tin
index 56f4769..cb171d7 100644
--- a/ds9/parsers/sexstr.tin
+++ b/ds9/parsers/sexstr.tin
@@ -1 +1 @@
-%token SEXSTR_
+%token SEXSTR_ sexagesimal
diff --git a/ds9/parsers/sfitsparser.tac b/ds9/parsers/sfitsparser.tac
index 6e4ece7..e7ab9c3 100644
--- a/ds9/parsers/sfitsparser.tac
+++ b/ds9/parsers/sfitsparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/shmparser.tac b/ds9/parsers/shmparser.tac
index 16ef7e1..8cddcee 100644
--- a/ds9/parsers/shmparser.tac
+++ b/ds9/parsers/shmparser.tac
@@ -1,10 +1,10 @@
 %{
 %}
+#include def.tin
 
 #include wcssys.tin
 #include int.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/siaparser.tac b/ds9/parsers/siaparser.tac
index a78a7a1..7dca210 100644
--- a/ds9/parsers/siaparser.tac
+++ b/ds9/parsers/siaparser.tac
@@ -1,5 +1,6 @@
 %{
 %}
+#include def.tin
 
 #include wcssys.tin
 #include skyframe.tin
@@ -7,7 +8,6 @@
 #include numeric.tin
 #include sexstr.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/skyviewparser.tac b/ds9/parsers/skyviewparser.tac
index 84ea1fb..3c13805 100644
--- a/ds9/parsers/skyviewparser.tac
+++ b/ds9/parsers/skyviewparser.tac
@@ -1,11 +1,11 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include imgsvr.tin
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/skyviewsendparser.tac b/ds9/parsers/skyviewsendparser.tac
index 7169daa..a4722f1 100644
--- a/ds9/parsers/skyviewsendparser.tac
+++ b/ds9/parsers/skyviewsendparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include imgsvrsend.tin
-#include def.tin
 
 %start skyviewsend
 
diff --git a/ds9/parsers/sleepparser.tac b/ds9/parsers/sleepparser.tac
index 3a4e053..8942bf1 100644
--- a/ds9/parsers/sleepparser.tac
+++ b/ds9/parsers/sleepparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/smoothparser.tac b/ds9/parsers/smoothparser.tac
index 274126a..d7f5c7f 100644
--- a/ds9/parsers/smoothparser.tac
+++ b/ds9/parsers/smoothparser.tac
@@ -1,10 +1,10 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/smoothsendparser.tac b/ds9/parsers/smoothsendparser.tac
index ecb4cc8..a44245e 100644
--- a/ds9/parsers/smoothsendparser.tac
+++ b/ds9/parsers/smoothsendparser.tac
@@ -1,6 +1,5 @@
 %{
 %}
-
 #include def.tin
 
 %start smoothsend
diff --git a/ds9/parsers/smosaicirafparser.tac b/ds9/parsers/smosaicirafparser.tac
index d9a0a66..bffce23 100644
--- a/ds9/parsers/smosaicirafparser.tac
+++ b/ds9/parsers/smosaicirafparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/smosaicwcsparser.tac b/ds9/parsers/smosaicwcsparser.tac
index 5a30738..5063df2 100644
--- a/ds9/parsers/smosaicwcsparser.tac
+++ b/ds9/parsers/smosaicwcsparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include wcssys.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/sourceparser.tac b/ds9/parsers/sourceparser.tac
index b12e2d7..7dc72ba 100644
--- a/ds9/parsers/sourceparser.tac
+++ b/ds9/parsers/sourceparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/srgbcubeparser.tac b/ds9/parsers/srgbcubeparser.tac
index a5807f9..1f15fef 100644
--- a/ds9/parsers/srgbcubeparser.tac
+++ b/ds9/parsers/srgbcubeparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/string.tin b/ds9/parsers/string.tin
index fefa662..d00e04c 100644
--- a/ds9/parsers/string.tin
+++ b/ds9/parsers/string.tin
@@ -1 +1 @@
-%token STRING_
+%token STRING_ string
diff --git a/ds9/parsers/threadsparser.tac b/ds9/parsers/threadsparser.tac
index ea73960..78e0d90 100644
--- a/ds9/parsers/threadsparser.tac
+++ b/ds9/parsers/threadsparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include int.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/threedparser.tac b/ds9/parsers/threedparser.tac
index 80539b8..789ed9a 100644
--- a/ds9/parsers/threedparser.tac
+++ b/ds9/parsers/threedparser.tac
@@ -1,10 +1,10 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/threedsendparser.tac b/ds9/parsers/threedsendparser.tac
index 17d77f2..ef0013b 100644
--- a/ds9/parsers/threedsendparser.tac
+++ b/ds9/parsers/threedsendparser.tac
@@ -1,6 +1,5 @@
 %{
 %}
-
 #include def.tin
 
 %start threedsend
diff --git a/ds9/parsers/tileparser.tac b/ds9/parsers/tileparser.tac
index af5d106..7c194c4 100644
--- a/ds9/parsers/tileparser.tac
+++ b/ds9/parsers/tileparser.tac
@@ -1,10 +1,10 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include int.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/tilesendparser.tac b/ds9/parsers/tilesendparser.tac
index 80f6c74..91c45bb 100644
--- a/ds9/parsers/tilesendparser.tac
+++ b/ds9/parsers/tilesendparser.tac
@@ -1,6 +1,5 @@
 %{
 %}
-
 #include def.tin
 
 %start tilesend
diff --git a/ds9/parsers/twomassparser.tac b/ds9/parsers/twomassparser.tac
index bf6ccf1..360043e 100644
--- a/ds9/parsers/twomassparser.tac
+++ b/ds9/parsers/twomassparser.tac
@@ -1,11 +1,11 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include imgsvr.tin
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/twomasssendparser.tac b/ds9/parsers/twomasssendparser.tac
index 4edb9fa..cc3c341 100644
--- a/ds9/parsers/twomasssendparser.tac
+++ b/ds9/parsers/twomasssendparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include imgsvrsend.tin
-#include def.tin
 
 %start twomasssend
 
diff --git a/ds9/parsers/updateparser.tac b/ds9/parsers/updateparser.tac
index faf5046..058f066 100644
--- a/ds9/parsers/updateparser.tac
+++ b/ds9/parsers/updateparser.tac
@@ -1,10 +1,10 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include int.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/urlfitsparser.tac b/ds9/parsers/urlfitsparser.tac
index cef1cee..14a5451 100644
--- a/ds9/parsers/urlfitsparser.tac
+++ b/ds9/parsers/urlfitsparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/viewparser.tac b/ds9/parsers/viewparser.tac
index 5f333af..880dc16 100644
--- a/ds9/parsers/viewparser.tac
+++ b/ds9/parsers/viewparser.tac
@@ -1,11 +1,11 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include coordsys.tin
 #include wcssys.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/viewsendparser.tac b/ds9/parsers/viewsendparser.tac
index 654d752..26fb5a4 100644
--- a/ds9/parsers/viewsendparser.tac
+++ b/ds9/parsers/viewsendparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include coordsys.tin
 #include wcssys.tin
-#include def.tin
 
 %start viewsend
 
diff --git a/ds9/parsers/vlaparser.tac b/ds9/parsers/vlaparser.tac
index 298d37f..1259e79 100644
--- a/ds9/parsers/vlaparser.tac
+++ b/ds9/parsers/vlaparser.tac
@@ -1,11 +1,11 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include imgsvr.tin
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/vlasendparser.tac b/ds9/parsers/vlasendparser.tac
index 390ecb8..c508b1d 100644
--- a/ds9/parsers/vlasendparser.tac
+++ b/ds9/parsers/vlasendparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include imgsvrsend.tin
-#include def.tin
 
 %start vlasend
 
diff --git a/ds9/parsers/vlssparser.tac b/ds9/parsers/vlssparser.tac
index 225b075..477b5ce 100644
--- a/ds9/parsers/vlssparser.tac
+++ b/ds9/parsers/vlssparser.tac
@@ -1,11 +1,11 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include imgsvr.tin
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/vlsssendparser.tac b/ds9/parsers/vlsssendparser.tac
index a498602..7858ba8 100644
--- a/ds9/parsers/vlsssendparser.tac
+++ b/ds9/parsers/vlsssendparser.tac
@@ -1,8 +1,8 @@
 %{
 %}
+#include def.tin
 
 #include imgsvrsend.tin
-#include def.tin
 
 %start vlsssend
 
diff --git a/ds9/parsers/voparser.tac b/ds9/parsers/voparser.tac
index 26e329c..27c9ac6 100644
--- a/ds9/parsers/voparser.tac
+++ b/ds9/parsers/voparser.tac
@@ -1,10 +1,10 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include int.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/vosendparser.tac b/ds9/parsers/vosendparser.tac
index 7303574..fe3d019 100644
--- a/ds9/parsers/vosendparser.tac
+++ b/ds9/parsers/vosendparser.tac
@@ -1,6 +1,5 @@
 %{
 %}
-
 #include def.tin
 
 %start vosend
diff --git a/ds9/parsers/wcsparser.tac b/ds9/parsers/wcsparser.tac
index a8dea04..ccd227f 100644
--- a/ds9/parsers/wcsparser.tac
+++ b/ds9/parsers/wcsparser.tac
@@ -1,5 +1,6 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include wcssys.tin
@@ -7,7 +8,6 @@
 #include skyformat.tin
 #include int.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/wcssendparser.tac b/ds9/parsers/wcssendparser.tac
index afb6b55..4099232 100644
--- a/ds9/parsers/wcssendparser.tac
+++ b/ds9/parsers/wcssendparser.tac
@@ -1,6 +1,5 @@
 %{
 %}
-
 #include def.tin
 
 %start wcssend
diff --git a/ds9/parsers/webparser.tac b/ds9/parsers/webparser.tac
index 801771c..be9df36 100644
--- a/ds9/parsers/webparser.tac
+++ b/ds9/parsers/webparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include int.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/widthparser.tac b/ds9/parsers/widthparser.tac
index 6954486..4f400a7 100644
--- a/ds9/parsers/widthparser.tac
+++ b/ds9/parsers/widthparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include int.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/xpafirstparser.tac b/ds9/parsers/xpafirstparser.tac
index 1c2851e..47d6c13 100644
--- a/ds9/parsers/xpafirstparser.tac
+++ b/ds9/parsers/xpafirstparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/xpaparser.tac b/ds9/parsers/xpaparser.tac
index 5606d94..5b9c9db 100644
--- a/ds9/parsers/xpaparser.tac
+++ b/ds9/parsers/xpaparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/xpasendparser.tac b/ds9/parsers/xpasendparser.tac
index ce526aa..aadbc71 100644
--- a/ds9/parsers/xpasendparser.tac
+++ b/ds9/parsers/xpasendparser.tac
@@ -1,6 +1,5 @@
 %{
 %}
-
 #include def.tin
 
 %start xpasend
diff --git a/ds9/parsers/zoomparser.tac b/ds9/parsers/zoomparser.tac
index 84bf825..92c65e2 100644
--- a/ds9/parsers/zoomparser.tac
+++ b/ds9/parsers/zoomparser.tac
@@ -1,9 +1,9 @@
 %{
 %}
+#include def.tin
 
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/zscaleparser.tac b/ds9/parsers/zscaleparser.tac
index 7e7fd2d..a0b3021 100644
--- a/ds9/parsers/zscaleparser.tac
+++ b/ds9/parsers/zscaleparser.tac
@@ -1,10 +1,10 @@
 %{
 %}
+#include def.tin
 
 #include yesno.tin
 #include numeric.tin
 #include string.tin
-#include def.tin
 
 %start command
 
diff --git a/ds9/parsers/zscalesendparser.tac b/ds9/parsers/zscalesendparser.tac
index 2af2c25..256db0b 100644
--- a/ds9/parsers/zscalesendparser.tac
+++ b/ds9/parsers/zscalesendparser.tac
@@ -1,6 +1,5 @@
 %{
 %}
-
 #include def.tin
 
 %start zscalesend