--- capa/capa51/GUITools/quizzer.tcl 1999/10/28 16:32:07 1.6 +++ capa/capa51/GUITools/quizzer.tcl 2000/01/12 21:00:25 1.12 @@ -948,7 +948,7 @@ proc createDateDialog { toplevel makedef checkbutton $optionsFrame2.response -variable gDates(inhibitresponse) \ -text "Inhibit Correct/Incorrect response \n(normally only for exams/quizzes)" pack $durationFrame $optionsFrame2.view $optionsFrame2.response -side top - set gDates(viewbetween) 1 + set gDates(viewbetween) 0 set gDates(inhibitresponse) 0 label $durationFrame.label -text "Duration" @@ -1580,7 +1580,7 @@ proc replaceAll {} { set gCreateImportLinks 1 getFindWindow refNum if { $refNum >= 0 } { registerCreateImportLinks $refNum 0.0 end } - displayMessage "Replaced $num occurance$s" + displayMessage "Replaced $num occurrence$s" } ########################################################### @@ -3005,11 +3005,15 @@ proc trackChanges { procName num } { set chars \[ .$procName get \$insertindex \$insertindex2 \] } set gUndo($num.\$numChange) \"insert \$insertindex \[list \$chars\] \" - if {\[regexp \{.*\[\"/\].*\} \$chars\] || \ - \[regexp \{.*\[\"/\].*\} \[.$procName get \"\$insertindex linestart\" \"\$insertindex2 lineend\"\]\]} { - registerCreateImportLinks $num \$insertindex \$insertindex2 + if { \[string length \$chars\] > 100 } { + registerCreateImportLinks $num \$insertindex-1line \$insertindex2+1line + } else { + if {\[regexp \{.*\[\"/\].*\} \$chars\] || \ + \[regexp \{.*\[\"/\].*\} \[.$procName get \"\$insertindex linestart\" \"\$insertindex2 lineend\"\]\]} { + registerCreateImportLinks $num \$insertindex \$insertindex2 + } } - } + } set result \[uplevel .$procName \$args\] updateLocation $num return \$result @@ -3785,7 +3789,10 @@ proc createCreateDviWin {} { # sends the file quiztemp.ps to the printer through lpr using # the option foud in gLprCommand ########################################################### -# Arguments: none +# Arguments: lprCommand - actual command to be run to print +# showCompletionMessage - (defaults to 1 true) +# controls whether the print complete +# message gets shown # Returns: Nothing # Globals: gCapaConfig - # gStopPrinting - @@ -3799,7 +3806,7 @@ proc printBody { lprCommand { showComple -o quiztemp.ps >& /dev/null} errorMsg ] if { $error } { displayError \ - "When attempting to run dvips an error occured : $errorMsg" + "When attempting to run dvips an error occurred : $errorMsg" return 1 } @@ -3814,7 +3821,7 @@ proc printBody { lprCommand { showComple set error [catch {set returnMessage [eval "exec $lprCommand"] } errorMsg ] if { $error == 1 } { - displayError "When attempting to print an error occured : $errorMsg" + displayError "When attempting to print an error occurred : $errorMsg" return 1 } else { if { $showCompletionMessage } { @@ -4070,12 +4077,14 @@ proc printSection { { lprCommand "" } } default { set type "-T" } } + set prSection [string trimleft $gPrintSelection(section) 0] + if { [set gStopPrinting [expr 2 == [runLatex \ "echo [pwd] | $gCapaConfig(qzparse_command) \ - -sec $gPrintSelection(section) -set $set \ + -sec $prSection -set $set \ -d [pwd] -c [pwd] $type " gCreateDviText] ] ] } { for {set i $start} { $i <= $end} { incr i } { - exec rm -f section$gPrintSelection(section)-set$i.tex + exec rm -f section$prSection-set$i.tex } if {$showStopping} { displayMessage "Printing has been stopped." @@ -4092,7 +4101,7 @@ proc printSection { { lprCommand "" } } } for { set i $start} { $i <= $end } { incr i } { - if { ! [file exists section$gPrintSelection(section)-set$i.tex] } { + if { ! [file exists section$prSection-set$i.tex] } { if {$showStopping} { displayError "The qzparse command: $gCapaConfig(qzparse_command), was unable to produce the expected output. Printing stopped" set gStopPrinting 0 @@ -4101,7 +4110,7 @@ proc printSection { { lprCommand "" } } return 2 } - exec mv section$gPrintSelection(section)-set$i.tex quiztemp.tex + exec mv section$prSection-set$i.tex quiztemp.tex exec /bin/rm -f quiztemp.dvi $gCreateDviText insert end "$gCapaConfig(latex_command)\n" @@ -4381,7 +4390,7 @@ proc analyzeClass { {start 1} } { set name [lindex $gAnalyze(toprocess) 1] set section [lindex $gAnalyze(toprocess) 2] set gAnalyze(toprocess) [lrange $gAnalyze(toprocess) 3 end] - set command "$gCapaConfig(answers_command) $number \"$name\" $section $gAnalyze(set)" + set command "$gCapaConfig(answers_command) $number \"$name\" 0 $gAnalyze(set)" set fileId [open "|$command" "r"] set gAnalyze(pid) [pid $fileId] fconfigure $fileId -blocking 0 @@ -4662,7 +4671,7 @@ proc analyzeStop {} { global gAnalyze set gAnalyze(stop) 1 set gAnalyze(status) "Stopped" - exec kill -SIGKILL $gAnalyze(pid) + catch {exec kill -SIGKILL $gAnalyze(pid)} } ###########################################################