From d4f1f85c0fc142495663fcacdddb9abcd259aa0e Mon Sep 17 00:00:00 2001
From: William Joye <wjoye@cfa.harvard.edu>
Date: Mon, 26 Nov 2018 16:18:54 -0500
Subject: update tcl/tk

---
 ds9/doc/release/r8.1.html              | 1 +
 ds9/library/ds9.tcl                    | 2 +-
 ds9/library/nsvr.tcl                   | 2 +-
 ds9/parsers/mosaicimagewfpc2lex.fcl    | 1 +
 ds9/parsers/mosaicimagewfpc2parser.tac | 8 +++++---
 make.include                           | 4 ++--
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ds9/doc/release/r8.1.html b/ds9/doc/release/r8.1.html
index 711567a..9ea2b43 100644
--- a/ds9/doc/release/r8.1.html
+++ b/ds9/doc/release/r8.1.html
@@ -18,6 +18,7 @@
 <li><tt>10.29.2018 BLOCK: all supported WCSs now updated to reflect blocking.</tt></li>
 <li><tt>10.30.2018 WFPC2: fixed an issue with blocking and WFPC2 images.</tt></li>
 <li><tt>11.06.2018 SAVEIMAGE: all supported WCSs now updated to reflect current rotation, orientation, pan, and zoom.</tt></li>
+<li><tt>11.26.2018 TCL/TK: updated to version 8.6.9.</tt></li>
 <li><tt><b>xx.xx.2018 RELEASE version 8.1b1</b></tt></li>
 </ol>
 </div>
diff --git a/ds9/library/ds9.tcl b/ds9/library/ds9.tcl
index 1459560..6e12d40 100644
--- a/ds9/library/ds9.tcl
+++ b/ds9/library/ds9.tcl
@@ -205,7 +205,7 @@ switch $ds9(wm) {
 	    source $ds9(root)/tcl8/8.5/msgcat-1.5.2.tm
 	}
 	if {![namespace exists http]} {
-	    source $ds9(root)/tcl8/8.6/http-2.8.12.tm
+	    source $ds9(root)/tcl8/8.6/http-2.9.0.tm
 	    source $ds9(root)/library/htp.tcl
 	}
 
diff --git a/ds9/library/nsvr.tcl b/ds9/library/nsvr.tcl
index b4430c2..e7192ce 100644
--- a/ds9/library/nsvr.tcl
+++ b/ds9/library/nsvr.tcl
@@ -31,7 +31,7 @@ proc NSVRServer {varname} {
 	vizier {append ${varname}(url) {/V}}
     }
 
-    set var(query) [http::formatQuery $var(name)]
+    set var(query) [http::mapReply $var(name)]
 
     NSVRGetURL $varname $var(url)
 }
diff --git a/ds9/parsers/mosaicimagewfpc2lex.fcl b/ds9/parsers/mosaicimagewfpc2lex.fcl
index bdcec4d..5e875f7 100644
--- a/ds9/parsers/mosaicimagewfpc2lex.fcl
+++ b/ds9/parsers/mosaicimagewfpc2lex.fcl
@@ -7,6 +7,7 @@
 
 %%
 
+mask	    {return $MASK_}
 new	    {return $NEW_}
 
 #include string.fin
diff --git a/ds9/parsers/mosaicimagewfpc2parser.tac b/ds9/parsers/mosaicimagewfpc2parser.tac
index 88030fd..a607419 100644
--- a/ds9/parsers/mosaicimagewfpc2parser.tac
+++ b/ds9/parsers/mosaicimagewfpc2parser.tac
@@ -6,6 +6,7 @@
 
 %start command
 
+%token MASK_
 %token NEW_
 
 %%
@@ -14,12 +15,13 @@
 command : mosaicimagewfpc2 
  ;
 
-mosaicimagewfpc2 : opts {MosaicImageWFPC2CmdLoad {}}
- | opts STRING_ {MosaicImageWFPC2CmdLoad $2}
+mosaicimagewfpc2 : opts {MosaicImageWFPC2CmdLoad {} $1}
+ | opts STRING_ {MosaicImageWFPC2CmdLoad $2 $1}
  ;
 
 opts :
- | NEW_ {CreateFrame}
+ | NEW_ {CreateFrame; set _ {}}
+ | MASK_ {set _ mask}
  ;
 
 %%
diff --git a/make.include b/make.include
index 137bd6e..105a14e 100644
--- a/make.include
+++ b/make.include
@@ -1,5 +1,5 @@
-# tcl 8.6.8
-# tk 8.6.8
+# tcl 8.6.9
+# tk 8.6.9
 # tcliis 1.0
 # tcllib 1.18
 # tclsignal 1.4
-- 
cgit v0.12