[saods9] 01/01: Remove titlefont and other unsupported arguments from blt calls

[Ole Streicher]

This is an automated email from the git hooks/post-receive script.

olebole pushed a commit to branch experimental
in repository saods9.

commit 61f7be12bc7ad5ba3d59be55ee66e291bddb15b3
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Thu Jul 2 11:53:38 2015 +0200

    Remove titlefont and other unsupported arguments from blt calls
---
 debian/patches/ds9_support_blt.patch | 60 +++++++++++++++++++++++++++++++++++-
 1 file changed, 59 insertions(+), 1 deletion(-)

diff --git a/debian/patches/ds9_support_blt.patch b/debian/patches/ds9_support_blt.patch
index acd3c25..4183d4e 100644
--- a/debian/patches/ds9_support_blt.patch
+++ b/debian/patches/ds9_support_blt.patch
@@ -87,7 +87,7 @@ Description: Allow the use of a standard BLT 2.X instead of tkblt
      PlotChangeMode $varname
 --- a/src/plot.tcl
 +++ b/src/plot.tcl
-@@ -1196,12 +1196,12 @@
+@@ -1196,20 +1196,19 @@
  	-font "{$ds9($var(graph,title,family))} $var(graph,title,size) $var(graph,title,weight) $var(graph,title,slant)"
  
      $var(graph) xaxis configure \
@@ -102,3 +102,61 @@ Description: Allow the use of a standard BLT 2.X instead of tkblt
  	-title $var(axis,y,title) \
  	-tickfont "{$ds9($var(axis,font,family))} $var(axis,font,size) $var(axis,font,weight) $var(axis,font,slant)" \
  	-titlefont "{$ds9($var(axis,title,family))} $var(axis,title,size) $var(axis,title,weight) $var(axis,title,slant)"
+ 
+     $var(graph) legend configure -hide [expr !$var(legend)] \
+-	-position $var(legend,position) -title $var(legend,title) \
+-	-font "{$ds9($var(legend,font,family))} $var(legend,font,size) $var(legend,font,weight) $var(legend,font,slant)" \
+-	-titlefont "{$ds9($var(legend,title,family))} $var(legend,title,size) $var(legend,title,weight) $var(legend,title,slant)"
++	-position $var(legend,position) \
++	-font "{$ds9($var(legend,font,family))} $var(legend,font,size) $var(legend,font,weight) $var(legend,font,slant)"
+ }
+ 
+ proc PlotCreateElement {varname} {
+--- a/src/plotdialog.tcl
++++ b/src/plotdialog.tcl
+@@ -200,14 +200,13 @@
+ 
+     global ds9
+ 
+-    blt::RemoveBindTag $var(graph) zoom-$var(graph)
+     bind $var(graph) <1> {}
+ 
+     switch $var(mode) {
+ 	pointer {bind $var(graph) <1> [list PlotButton $varname %x %y]}
+ 	zoom {
+ 	    switch $ds9(wm) {
+-		x11 -
++		x11 {Blt_ZoomStack $var(graph)}
+ 		win32 {Blt_ZoomStack $var(graph) -mode release}
+ 		aqua {Blt_ZoomStack $var(graph) -mode release -button "ButtonPress-2"}
+ 	    }
+--- a/src/plotprint.tcl
++++ b/src/plotprint.tcl
+@@ -40,18 +40,10 @@
+ 	-titlefont "$var(axis,title,family) $var(axis,title,size) $var(axis,title,weight) $var(axis,title,slant)"
+ 
+     $var(graph) legend configure \
+-	-font "$var(legend,font,family) $var(legend,font,size) $var(legend,font,weight) $var(legend,font,slant)" \
+-	-titlefont "$var(legend,title,family) $var(legend,title,size) $var(legend,title,weight) $var(legend,title,slant)"
++	-font "$var(legend,font,family) $var(legend,font,size) $var(legend,font,weight) $var(legend,font,slant)"
+ 
+     set options "-decorations false"
+ 
+-    # Color
+-    switch -- $ps(color) {
+-	rgb -
+-	cmyk {append options " -greyscale no"}
+-	gray {append options " -greyscale yes"}
+-    }
+-
+     # Size
+     set ww [expr [winfo width $var(top)]*$ps(scale)/100./[tk scaling]]
+     set hh [expr [winfo height $var(top)]*$ps(scale)/100./[tk scaling]]
+@@ -107,6 +99,5 @@
+ 	-titlefont "{$ds9($var(axis,title,family))} $var(axis,title,size) $var(axis,title,weight) $var(axis,title,slant)"
+ 
+     $var(graph) legend configure \
+-	-font "{$ds9($var(legend,font,family))} $var(legend,font,size) $var(legend,font,weight) $var(legend,font,slant)" \
+-	-titlefont "{$ds9($var(legend,title,family))} $var(legend,title,size) $var(legend,title,weight) $var(legend,title,slant)"
++	-font "{$ds9($var(legend,font,family))} $var(legend,font,size) $var(legend,font,weight) $var(legend,font,slant)"
+ }

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-astro/packages/saods9.git