From a0baa564b54177527964fae8f0cc0d64d7db8ac7 Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Tue, 20 Feb 2018 15:16:04 -0500
Subject: add tcl parser support

---
 ds9/library/ds9.tcl                                    |  2 +-
 .../Frameworks/Tksao.framework/Resources/Info.plist    | 10 +++++-----
 ds9/macos/SAOImageDS9.app/Contents/Info.plist          |  6 +++---
 ds9/macos/configure                                    | 18 +++++++++---------
 ds9/macos/configure.ac                                 |  2 +-
 ds9/make.include                                       | 10 +++++++++-
 ds9/unix/configure                                     | 18 +++++++++---------
 ds9/unix/configure.ac                                  |  2 +-
 ds9/win/configure                                      | 18 +++++++++---------
 ds9/win/configure.ac                                   |  2 +-
 ds9/win/ds9.rc                                         |  6 +++---
 11 files changed, 51 insertions(+), 43 deletions(-)

diff --git a/ds9/library/ds9.tcl b/ds9/library/ds9.tcl
index 168d447..1f4b8d5 100644
--- a/ds9/library/ds9.tcl
+++ b/ds9/library/ds9.tcl
@@ -13,7 +13,7 @@ proc DS9Def {} {
     }
 
     # for beta version, MUST have space
-    set ds9(version) {7.6}
+    set ds9(version) {7.7 b1}
 
     set ds9(top) .
     set ds9(mb) .mb
diff --git a/ds9/macos/SAOImageDS9.app/Contents/Frameworks/Tksao.framework/Resources/Info.plist b/ds9/macos/SAOImageDS9.app/Contents/Frameworks/Tksao.framework/Resources/Info.plist
index 832f4a4..825dcbf 100644
--- a/ds9/macos/SAOImageDS9.app/Contents/Frameworks/Tksao.framework/Resources/Info.plist
+++ b/ds9/macos/SAOImageDS9.app/Contents/Frameworks/Tksao.framework/Resources/Info.plist
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--
-  Copyright (C) 1999-2017
+  Copyright (C) 1999-2018
   Smithsonian Astrophysical Observatory, Cambridge, MA, USA
   For conditions of distribution and use, see copyright notice in "copyright"
 	this file, and for a DISCLAIMER OF ALL WARRANTIES.
@@ -14,8 +14,8 @@
 	<key>CFBundleExecutable</key>
 	<string>Tk</string>
 	<key>CFBundleGetInfoString</key>
-	<string>Tksao 7.6,
-Copyright 1999-2017
+	<string>Tksao 7.7,
+Copyright 1999-2018
 Smithsonian Astrophysical Observatory"</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.sao.tksao</string>
@@ -26,10 +26,10 @@ Smithsonian Astrophysical Observatory"</string>
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>7.6</string>
+	<string>7.7</string>
 	<key>CFBundleSignature</key>
 	<string>Tksao  </string>
 	<key>CFBundleVersion</key>
-	<string>7.6</string>
+	<string>7.7</string>
 </dict>
 </plist>
diff --git a/ds9/macos/SAOImageDS9.app/Contents/Info.plist b/ds9/macos/SAOImageDS9.app/Contents/Info.plist
index 7c25717..28d27a6 100644
--- a/ds9/macos/SAOImageDS9.app/Contents/Info.plist
+++ b/ds9/macos/SAOImageDS9.app/Contents/Info.plist
@@ -35,7 +35,7 @@
 	<key>CFBundleExecutable</key>
 	<string>ds9</string>
 	<key>CFBundleGetInfoString</key>
-	<string>"SAOImageDS9 7.6
+	<string>"SAOImageDS9 7.7b1
 Copyright 1999-2018
 Smithsonian Astrophysical Observatory"</string>
 	<key>CFBundleIconFile</key>
@@ -49,11 +49,11 @@ Smithsonian Astrophysical Observatory"</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>7.6</string>
+	<string>7.7b1</string>
 	<key>CFBundleSignature</key>
 	<string>DS9</string>
 	<key>CFBundleVersion</key>
-	<string>7.6</string>
+	<string>7.7b1</string>
 	<key>NSHighResolutionCapable</key>
 	<string>True</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/ds9/macos/configure b/ds9/macos/configure
index 54194e0..17ec579 100755
--- a/ds9/macos/configure
+++ b/ds9/macos/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ds9 7.6.
+# Generated by GNU Autoconf 2.69 for ds9 7.7.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ds9'
 PACKAGE_TARNAME='ds9'
-PACKAGE_VERSION='7.6'
-PACKAGE_STRING='ds9 7.6'
+PACKAGE_VERSION='7.7'
+PACKAGE_STRING='ds9 7.7'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1503,7 +1503,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ds9 7.6 to adapt to many kinds of systems.
+\`configure' configures ds9 7.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1568,7 +1568,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ds9 7.6:";;
+     short | recursive ) echo "Configuration of ds9 7.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1695,7 +1695,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ds9 configure 7.6
+ds9 configure 7.7
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2060,7 +2060,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ds9 $as_me 7.6, which was
+It was created by ds9 $as_me 7.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -15474,7 +15474,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ds9 $as_me 7.6, which was
+This file was extended by ds9 $as_me 7.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15527,7 +15527,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ds9 config.status 7.6
+ds9 config.status 7.7
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/ds9/macos/configure.ac b/ds9/macos/configure.ac
index 6aca1bd..0305561 100644
--- a/ds9/macos/configure.ac
+++ b/ds9/macos/configure.ac
@@ -19,7 +19,7 @@ dnl	to configure the system for the local environment.
 # so that we create the export library with the dll.
 #-----------------------------------------------------------------------
 
-AC_INIT([ds9], [7.6])
+AC_INIT([ds9], [7.7])
 
 #--------------------------------------------------------------------
 # Call TEA_INIT as the first TEA_ macro to set up initial vars.
diff --git a/ds9/make.include b/ds9/make.include
index c49aa53..0797797 100644
--- a/ds9/make.include
+++ b/ds9/make.include
@@ -1,6 +1,14 @@
+#--------------------------parser
+
+%.tcl: %.fcl
+	tclsh $(prefix)/fickle/fickle.tcl $<
+
+%.tcl: %.tac
+	tclsh $(prefix)/taccle/taccle.tcl -d -v -w $<
+
 #--------------------------framework
 
-$(LIBDIR)/library : $(prefix)/ds9/library/*.tcl
+$(LIBDIR)/library : $(prefix)/ds9/library/parser.tcl $(prefix)/ds9/library/lex.tcl $(prefix)/ds9/library/*.tcl
 	mkdir -p "$@"
 	cp -p $? "$@"
 # must do it this way for win
diff --git a/ds9/unix/configure b/ds9/unix/configure
index efb03ae..0299936 100755
--- a/ds9/unix/configure
+++ b/ds9/unix/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ds9 7.6.
+# Generated by GNU Autoconf 2.69 for ds9 7.7.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ds9'
 PACKAGE_TARNAME='ds9'
-PACKAGE_VERSION='7.6'
-PACKAGE_STRING='ds9 7.6'
+PACKAGE_VERSION='7.7'
+PACKAGE_STRING='ds9 7.7'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1504,7 +1504,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ds9 7.6 to adapt to many kinds of systems.
+\`configure' configures ds9 7.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1569,7 +1569,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ds9 7.6:";;
+     short | recursive ) echo "Configuration of ds9 7.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1696,7 +1696,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ds9 configure 7.6
+ds9 configure 7.7
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2061,7 +2061,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ds9 $as_me 7.6, which was
+It was created by ds9 $as_me 7.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -15604,7 +15604,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ds9 $as_me 7.6, which was
+This file was extended by ds9 $as_me 7.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -15657,7 +15657,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ds9 config.status 7.6
+ds9 config.status 7.7
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/ds9/unix/configure.ac b/ds9/unix/configure.ac
index 8fcebc6..8c19dee 100644
--- a/ds9/unix/configure.ac
+++ b/ds9/unix/configure.ac
@@ -19,7 +19,7 @@ dnl	to configure the system for the local environment.
 # so that we create the export library with the dll.
 #-----------------------------------------------------------------------
 
-AC_INIT([ds9], [7.6])
+AC_INIT([ds9], [7.7])
 
 #--------------------------------------------------------------------
 # Call TEA_INIT as the first TEA_ macro to set up initial vars.
diff --git a/ds9/win/configure b/ds9/win/configure
index e71c2ce..a330761 100755
--- a/ds9/win/configure
+++ b/ds9/win/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for ds9 7.6.
+# Generated by GNU Autoconf 2.69 for ds9 7.7.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -577,8 +577,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='ds9'
 PACKAGE_TARNAME='ds9'
-PACKAGE_VERSION='7.6'
-PACKAGE_STRING='ds9 7.6'
+PACKAGE_VERSION='7.7'
+PACKAGE_STRING='ds9 7.7'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1488,7 +1488,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures ds9 7.6 to adapt to many kinds of systems.
+\`configure' configures ds9 7.7 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1549,7 +1549,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of ds9 7.6:";;
+     short | recursive ) echo "Configuration of ds9 7.7:";;
    esac
   cat <<\_ACEOF
 
@@ -1672,7 +1672,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-ds9 configure 7.6
+ds9 configure 7.7
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2037,7 +2037,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by ds9 $as_me 7.6, which was
+It was created by ds9 $as_me 7.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -14493,7 +14493,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by ds9 $as_me 7.6, which was
+This file was extended by ds9 $as_me 7.7, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14546,7 +14546,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-ds9 config.status 7.6
+ds9 config.status 7.7
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
diff --git a/ds9/win/configure.ac b/ds9/win/configure.ac
index eb30ac6..289053b 100644
--- a/ds9/win/configure.ac
+++ b/ds9/win/configure.ac
@@ -19,7 +19,7 @@ dnl	to configure the system for the local environment.
 # so that we create the export library with the dll.
 #-----------------------------------------------------------------------
 
-AC_INIT([ds9], [7.6])
+AC_INIT([ds9], [7.7])
 
 #--------------------------------------------------------------------
 # Call TEA_INIT as the first TEA_ macro to set up initial vars.
diff --git a/ds9/win/ds9.rc b/ds9/win/ds9.rc
index 4795870..149ef21 100644
--- a/ds9/win/ds9.rc
+++ b/ds9/win/ds9.rc
@@ -1,10 +1,10 @@
 #include <windows.h>
 
-#define VV "7.6"
+#define VV "7.6b1"
 
 VS_VERSION_INFO VERSIONINFO
- FILEVERSION    7,6,0,0
- PRODUCTVERSION 7,6,0,0
+ FILEVERSION    7,7,0,0
+ PRODUCTVERSION 7,7,0,0
  FILEFLAGSMASK	0x3fL
  FILEFLAGS	0x0L
  FILEOS		VOS__WINDOWS32
-- 
cgit v0.12