From 3cc4fef5eb948a107677c26702a1872ffc1b6d60 Mon Sep 17 00:00:00 2001 From: drh Date: Fri, 19 Jul 2002 14:27:44 +0000 Subject: Fix a bug in the Postscript encoding vector generator that was causing postscript generation to fail under Win2K. --- ChangeLog | 5 +++++ library/mkpsenc.tcl | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index a840a82..d07c396 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2002-07-19 D. Richard Hipp + + * library/mkpsec.tcl: Fix a bug that was causing postscript generation + to fail under Win2K. + 2002-07-18 Reinhard Max * unix/tkUnixSend.c: Using Tcl_GetTime instead of TclpGetTime. diff --git a/library/mkpsenc.tcl b/library/mkpsenc.tcl index b8603ea..e7fce19 100644 --- a/library/mkpsenc.tcl +++ b/library/mkpsenc.tcl @@ -9,8 +9,8 @@ proc ::tk::CreatePostscriptEncoding {encoding} { set result "/CurrentEncoding \[\n" for {set i 0} {$i<256} {incr i 8} { for {set j 0} {$j<8} {incr j} { - set hexcode [format "%04X" [scan [encoding convertfrom\ - $encoding [format "%c" [expr $i+$j] ]] %c]] + set enc [encoding convertfrom $encoding [format %c [expr {$i+$j}]]] + if {[catch {format %04X [scan $enc %c]} hexcode]} continue if [info exists ::tk::psglyphs($hexcode)] { append result "/$::tk::psglyphs($hexcode)" } else { @@ -1089,7 +1089,7 @@ append ps_preamable { 50 dict begin % This is a standard prolog for Postscript generated by Tk's canvas % widget. -% RCS: @(#) $Id: mkpsenc.tcl,v 1.1 2002/06/25 16:27:43 a_kovalenko Exp $ +% RCS: @(#) $Id: mkpsenc.tcl,v 1.2 2002/07/19 14:27:45 drh Exp $ % The definitions below just define all of the variables used in % any of the procedures here. This is needed for obscure reasons @@ -1365,4 +1365,3 @@ append ps_preamable { proc tk::ensure_psenc_is_loaded {} { } - -- cgit v0.12