--- capa/capa51/GUITools/gradesubjective.tcl	1999/12/03 18:39:38	1.6
+++ capa/capa51/GUITools/gradesubjective.tcl	1999/12/07 19:45:45	1.8
@@ -31,8 +31,9 @@ proc createGradeSubjWindow {} {
 
     set info [frame $gradSubj.info]
     set grade [frame $gradSubj.grade]
+    set keyword [frame $gradSubj.keyword]
     set gSubj(pictFrame) [set picts [frame $gradSubj.picts -borderwidth 4 -relief groove]]
-    pack $info $grade -side top
+    pack $info $grade $keyword -side top
 
     set msg [frame $info.msg]
     set id [frame $info.id]
@@ -116,6 +117,25 @@ proc createGradeSubjWindow {} {
     pack $bot.scroll 
     pack configure $bot.scroll -expand 0 -fill x
 
+    set left [frame $keyword.left]
+    set left2 [frame $keyword.left2]
+    set right [frame $keyword.right]
+    pack $left $left2 $right -side left
+
+    set gSubj(keyword) [text $right.keyword -width 60 -height 5 \
+			    -yscrollcommand "$right.scroll set" ]
+    puts $gSubj(keyword)
+    puts $right
+    scrollbar $right.scroll -command "$right.response yview"
+    pack $gSubj(keyword) $right.scroll -side left
+    pack configure $right.scroll -fill y
+
+    button $left.add -command "subjAddKeyword" -text "Add"
+    button $left2.addsp -command "subjAddKeywordSpelling" -text "Add Sp"
+    button $left.delete -command "subjDeleteKeyword" -text "Delete"
+    button $left2.see -command "subjSeeKeyword" -text "See Sp"
+    pack $left.add $left2.addsp $left.delete $left2.see -side top
+
     wm geometry $gradSubj "-10+0"
 
     set score0 [frame $score.score0]
@@ -143,18 +163,18 @@ proc createGradeSubjWindow {} {
     frame  $command2.space2 -height 30
     frame  $command2.space22 -height 5
     button $command1.next -text "Next" -command subjNext -width $buttonwidth
-    button $command2.prev -text "Prev" -command subjPrev -width $buttonwidth
-    button $command1.findid -text "Find ID" -command subjFindId -width $buttonwidth
-    button $command2.addid -text "Add ID" -command subjAddId -width $buttonwidth
-    button $command1.findname -text "Find Name" -command subjFindName -width $buttonwidth
-    button $command2.goto -text "GoTo" -command subjGoto -width $buttonwidth
+    button $command1.prev -text "Prev" -command subjPrev -width $buttonwidth
+    button $command1.goto -text "GoTo" -command subjGoto -width $buttonwidth
     button $command1.exit -text "Exit" -command subjDone -width $buttonwidth
+    button $command2.findid -text "Find ID" -command subjFindId -width $buttonwidth
+    button $command2.addid -text "Add ID" -command subjAddId -width $buttonwidth
+    button $command2.findname -text "Find Name" -command subjFindName -width $buttonwidth
     checkbutton $command2.wrap -text wrap -command subjWrap -variable gSubj(wrap)
     checkbutton $command2.pict -text pict -command subjPict -variable gSubj(pict)
     checkbutton $command1.done -text graded -variable gSubj(donestat) -state disabled
     pack $command1.setnext $command2.set $command1.space1 $command2.space2 \
-	$command1.next $command2.prev $command1.findid \
-	$command2.addid $command1.findname $command1.exit $command2.goto \
+	$command1.next $command1.prev $command2.findid \
+	$command2.addid $command2.findname $command1.goto $command1.exit \
         $command2.wrap $command2.pict $command1.done $command2.space22
 
     button $morebut.print -text "Print Response" -command subjPrint \
@@ -915,11 +935,59 @@ proc subjViewResponse {} {
 }
 
 ###########################################################
+# subjUpdateResponse
+###########################################################
+###########################################################
+###########################################################
+proc subjUpdateResponse {} {
+    gSubj
+}
+
+###########################################################
+# subjUpdateKeywords
+###########################################################
+###########################################################
+###########################################################
+proc subjUpdateKeywords {} {
+    global gSubj
+    $gSubj(keyword) delete 0.0 end
+    puts $gSubj(keywords)
+    foreach keyword $gSubj(keywords) { lappend lokeyword [lindex $keyword 0] }
+    set lokeyword [lsort $lokeyword]
+    set max 0
+    foreach key $lokeyword {
+	if { [string length $key] > $max } { set max [string length $key] }
+    }
+    incr max
+    set numcol [expr 60/$max]
+    set end [llength $lokeyword]
+    set lastline 0
+    for { set i 0 } { $i < $end } { incr i } {
+	set line [expr $i/$numcol]
+	set col [expr $i%$numcol*$max]
+	puts $line.$col
+	$gSubj(keyword) insert end [format "%-[set max]s" [lindex $lokeyword $i]]
+	if {($col + (2*$max)) > 60} {
+	    puts "Putting in newlne"
+	    $gSubj(keyword) insert end "\n"
+	    set lastline $line
+	}
+    }
+    subjUpdateResponse
+}
+
+###########################################################
 # subjAddKeyword
 ###########################################################
 ###########################################################
 ###########################################################
 proc subjAddKeyword {} {
     global gSubj gUniqueNumber
-    
+
+    if { "" == [set keyword [getString [winfo toplevel $gSubj(keyword)] "Enter a new keyword"]]} {
+	return
+    }
+    puts "New keyword $keyword"
+    lappend gSubj(keywords) [list $keyword [list $keyword]]
+    subjUpdateKeywords
 }