Fixing legacy mask file loading and comments starting with -

Author: whelanh

tcl/start.tcl

@@ -253,7 +253,13 @@ proc InitTooltip {} {
     source [file nativename [file join $::scidTclDir "utils/tklib_tooltip.tcl"]]
   }
   namespace eval ::utils::tooltip {
-    proc Set {args} { tooltip::tooltip {*}$args }
+    proc Set {args} {
+      set msg [lindex $args end]
+      if {[string match "-*" $msg]} {
+        set args [lreplace $args end end " $msg"]
+      }
+      tooltip::tooltip {*}$args
+    }
   }
 }
 InitTooltip

tcl/utils/tklib_tooltip.tcl

@@ -190,7 +190,7 @@ proc ::tooltip::register {w args} {
     while {[string match -* $key]} {
 	switch -- $key {
 	    -- {
-		set args [lassign $args _ key]
+		set args [lassign $args _]
 		break
 	    }
 	    -heading {

tcl/windows/tree.tcl

@@ -453,7 +453,7 @@ proc ::tree::displayLines { baseNumber moves } {
       set hasPositionComment 1
       set firstLine [ lindex [split $posComment "\n"] 0 ]
       $w.f.tl insert end "$firstLine\n" [ list bluefg tagtooltip_poscomment ]
-      ::utils::tooltip::Set $w.f.tl -tag tagtooltip_poscomment -- $posComment
+      ::utils::tooltip::Set $w.f.tl -tag tagtooltip_poscomment $posComment
       $w.f.tl tag bind tagtooltip_poscomment <Double-Button-1> "::tree::mask::addComment"
     }
   }
@@ -521,7 +521,7 @@ proc ::tree::displayLines { baseNumber moves } {
       if {$comment != ""} {
         set firstLine [ lindex [split $comment "\n"] 0 ]
         $w.f.tl insert end " $firstLine" tagtooltip$i
-        ::utils::tooltip::Set $w.f.tl -tag tagtooltip$i -- $comment
+        ::utils::tooltip::Set $w.f.tl -tag tagtooltip$i $comment
         $w.f.tl tag bind tagtooltip$i <Double-Button-1> "::tree::mask::addComment $move"
       }
     }
@@ -578,9 +578,13 @@ proc ::tree::displayLines { baseNumber moves } {
       $w.f.tl insert end "[::trans [lindex $m 0] ]" bluefg
       # comment
       set comment [lindex $m 3]
-      set firstLine [ lindex [split $comment "\n"] 0 ]
-      $w.f.tl insert end " $firstLine\n" tagtooltip$idx
-      ::utils::tooltip::Set $w.f.tl -tag tagtooltip$idx -- $comment
+      if {$comment != ""} {
+        set firstLine [ lindex [split $comment "\n"] 0 ]
+        $w.f.tl insert end " $firstLine" tagtooltip$idx
+        ::utils::tooltip::Set $w.f.tl -tag tagtooltip$idx $comment
+        $w.f.tl tag bind tagtooltip$idx <Double-Button-1> "::tree::mask::addComment [lindex $m 0]"
+      }
+      $w.f.tl insert end "\n"
 
       # Bind right button to popup a contextual menu:
       $w.f.tl tag bind tagclick$idx <ButtonPress-$::MB3> "::tree::mask::contextMenu $w.f.tl  [lindex $m 0] %x %y %X %Y ; break"