From eafc6af129cf5f2c71ee4fde54885e0167dd96e5 Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Thu, 27 Sep 2018 11:43:32 -0400
Subject: CONTOUR: fixed contour parser nlevels problem.

---
 ds9/doc/release/r8.0.html                     | 2 ++
 ds9/library/ds9.tcl                           | 2 +-
 ds9/macos/SAOImageDS9.app/Contents/Info.plist | 6 +++---
 ds9/parsers/contourparser.tac                 | 2 +-
 ds9/win/ds9.rc                                | 2 +-
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/ds9/doc/release/r8.0.html b/ds9/doc/release/r8.0.html
index 1408a27..66d7220 100644
--- a/ds9/doc/release/r8.0.html
+++ b/ds9/doc/release/r8.0.html
@@ -85,6 +85,8 @@ incorrectly calculating an index into the data cube.</tt></li>
 <li><tt><b>09.25.2018 RELEASE version 8.0rc3</b></tt></li>
 <li><tt>09.26.2018 BIN: fixed old style Einstein WCS keyword CRVAL2.</tt></li>
 <li><tt><b>09.26.2018 RELEASE version 8.0rc4</b></tt></li>
+<li><tt>09.27.2018 CONTOUR: fixed contour parser nlevels problem.</tt></li>
+<li><tt><b>09.28.2018 RELEASE version 8.0rc5</b></tt></li>
 </ol>
 </div>
 </body>
diff --git a/ds9/library/ds9.tcl b/ds9/library/ds9.tcl
index b9e83af..37cb4e5 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) {8.0 rc4}
+    set ds9(version) {8.0 rc5}
 
     set ds9(top) .
     set ds9(mb) .mb
diff --git a/ds9/macos/SAOImageDS9.app/Contents/Info.plist b/ds9/macos/SAOImageDS9.app/Contents/Info.plist
index c724d69..fba3fd7 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 8.0rc4
+	<string>"SAOImageDS9 8.0rc5
 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>8.0rc4</string>
+	<string>8.0rc5</string>
 	<key>CFBundleSignature</key>
 	<string>DS9</string>
 	<key>CFBundleVersion</key>
-	<string>8.0rc4</string>
+	<string>8.0rc5</string>
 	<key>NSHighResolutionCapable</key>
 	<string>True</string>
 	<key>LSMinimumSystemVersion</key>
diff --git a/ds9/parsers/contourparser.tac b/ds9/parsers/contourparser.tac
index 5ff8313..73bda46 100644
--- a/ds9/parsers/contourparser.tac
+++ b/ds9/parsers/contourparser.tac
@@ -81,7 +81,7 @@ contour : yesno {ProcessCmdSet contour view $1 UpdateContour}
  | DASH_ yesno {ContourDialog; ProcessCmdSet contour dash $2 UpdateContour}
  | SMOOTH_ INT_ {ContourCmdGenerateDialog smooth $2}
  | METHOD_ method {ContourCmdGenerateDialog method $2}
- | NLEVELS_ INT_ {ContourCmdGenerateDialog nlevel $2}
+ | NLEVELS_ INT_ {ContourCmdGenerateDialog numlevel $2}
  | SCALE_ scale {ContourCmdScale scale $2}
  | LOG_ log
  | MODE_ modes
diff --git a/ds9/win/ds9.rc b/ds9/win/ds9.rc
index 91e3a4d..5c760cb 100644
--- a/ds9/win/ds9.rc
+++ b/ds9/win/ds9.rc
@@ -1,6 +1,6 @@
 #include <windows.h>
 
-#define VV "8.0rc4"
+#define VV "8.0rc5"
 
 VS_VERSION_INFO VERSIONINFO
  FILEVERSION    8,0,0,0
-- 
cgit v0.12