Merge branch 'r8.0'

	modified:   ds9/doc/release/r8.0.html
	modified:   ds9/library/ds9.tcl
	modified:   ds9/library/help.tcl
	modified:   ds9/library/prefs.tcl
	modified:   ds9/library/samp.tcl
	modified:   ds9/library/util.tcl
	modified:   ds9/parsers/pslex.fcl
	modified:   ds9/parsers/psparser.tac

5 files changed, 9 insertions, 7 deletions

diff --git a/ds9/library/ds9.tcl b/ds9/library/ds9.tcl
index 6e12d40..6f05a58 100644
--- a/ds9/library/ds9.tcl
+++ b/ds9/library/ds9.tcl
@@ -12,8 +12,10 @@ proc DS9Def {} {
 	win32 {set ds9(title) [file rootname $ds9(app)]}
     }
 
-    # for beta version, MUST have space
-    set ds9(version) {8.1 b1}
+    # Must be major,minor
+    set ds9(version) {8.1}
+    # For display purposes only
+    set ds9(version,display) {8.1b1}
 
     set ds9(top) .
     set ds9(mb) .mb
diff --git a/ds9/library/help.tcl b/ds9/library/help.tcl
index 3310e45..dff8bc7 100644
--- a/ds9/library/help.tcl
+++ b/ds9/library/help.tcl
@@ -19,7 +19,7 @@ proc HelpDef {} {
     set help(vo) "$ds9(root)/doc/ref/vo.html"
 
     set help(authors) "William Joye (Smithsonian Astrophysical Observatory)\nEric Mandel (Smithsonian Astrophysical Observatory)\nSteve Murray (Smithsonian Astrophysical Observatory)\n"
-    set help(about) "SAOImageDS9\nVersion $ds9(version)\n\nAuthors\n$help(authors)\nSAOImage DS9 development has been made possible by funding from NASA's Applied Information Systems Research Program, Chandra X-ray Science Center (CXC), and the High Energy Astrophysics Science Archive Center (HEASARC). Additional funding was provided by the JWST Mission office at Space Telescope Science Institute to improve capabilities for 3D data visualization.\n\nColormaps\nh5utils: Steven Johnson (MIT)\nViridis: Eric Firing (UW)\nCubehelix: Dave Green (Cavendish)\nGist: David Munro (LLNL)\nTopographic: Tom Patterson (US National Park Service) "
+    set help(about) "SAOImageDS9\nVersion $ds9(version,display)\n\nAuthors\n$help(authors)\nSAOImage DS9 development has been made possible by funding from NASA's Applied Information Systems Research Program, Chandra X-ray Science Center (CXC), and the High Energy Astrophysics Science Archive Center (HEASARC). Additional funding was provided by the JWST Mission office at Space Telescope Science Institute to improve capabilities for 3D data visualization.\n\nColormaps\nh5utils: Steven Johnson (MIT)\nViridis: Eric Firing (UW)\nCubehelix: Dave Green (Cavendish)\nGist: David Munro (LLNL)\nTopographic: Tom Patterson (US National Park Service) "
 }
 
 proc HelpRef {} {
diff --git a/ds9/library/prefs.tcl b/ds9/library/prefs.tcl
index f2dfb59..9ca01f8 100644
--- a/ds9/library/prefs.tcl
+++ b/ds9/library/prefs.tcl
@@ -47,7 +47,7 @@ proc LoadPrefs {} {
 		    if {$minor>0} {
 			set minor [expr $minor-1]
 		    } else {
-			set major [expr $minor-1]
+			set major [expr $major-1]
 			set minor 9
 		    }
 		}
diff --git a/ds9/library/samp.tcl b/ds9/library/samp.tcl
index 981591b..0118493 100644
--- a/ds9/library/samp.tcl
+++ b/ds9/library/samp.tcl
@@ -988,7 +988,7 @@ proc samp.client.receiveCall {args} {
 	    SAMPReplySimple $msgid "http://ds9.si.edu"
 	}
 	x-samp.releasenotes.url {
-	    SAMPReplySimple $msgid OK "http://ds9.si.edu/doc/release/r7.0.html"
+	    SAMPReplySimple $msgid OK "http://ds9.si.edu/doc/release/r8.0.html"
 	}
 	x-samp.faq.url {
 	    SAMPReplySimple $msgid OK "http://ds9.si.edu/doc/faq.html"
@@ -998,7 +998,7 @@ proc samp.client.receiveCall {args} {
 	    SAMPReplySimple $msgid OK "$help(authors)"
 	}
 	x-samp.release.version {
-	    SAMPReplySimple $msgid OK "$ds9(version)"
+	    SAMPReplySimple $msgid OK "$ds9(version,display)"
 	}
 	ds9.get {
 	    SAMPRcvdDS9Get $msgid params
diff --git a/ds9/library/util.tcl b/ds9/library/util.tcl
index b1af02c..9994119 100644
--- a/ds9/library/util.tcl
+++ b/ds9/library/util.tcl
@@ -1673,7 +1673,7 @@ proc ProcessSendThemeCmd {proc id param {sock {}} {fn {}}} {
 
 proc ProcessSendVersionCmd {proc id param {sock {}} {fn {}}} {
     global ds9
-    $proc $id "$ds9(title) [lindex $ds9(version) 0]\n"
+    $proc $id "$ds9(title) $ds9(version,display)\n"
 }
 
 proc XMLQuote {val} {