                     tkdesk-1.0b4 Japanization Patch 
                      (Unofficial Version.05011998)


    This is the Japanization patch for tkdesk-1.0.
(You can get the smooth desktop manager tkdesk-1.0 from
the TkDesk website: http://tkdesk.sourceforge.net)

    If you apply this patch, you can compile tkdesk-1.0 with
tcl7.6jp/tk4.2jp and you will be able to input Japanese on
built-in editor of tkdesk-1.0.

== TIPS ==
  You need tkWStr.h.  If there is not tkWStr.h at the directory which
there are tcl.h and tk.h too (may be /usr/local/include/), you must
copy tkWStr.h by hand from the directory you compiled tk4.2jp
(tk4.2/generic/tkWStr.h).


    To apply this patch, you should do 'cd' to the *parent* directory
of 'tkdesk-1.0' (It is made from tkdesk-1.0.tar.gz) and do
"patch < thisFile".

example:

    % ls -F
    tkdesk-1.0/          tkdesk-1.0jp-patch
    % patch < tkdesk-1.0jp-patch



    If you find any problems, please tell me about it.
Please send e-mail to kawakazu@yk.rim.or.jp


                                                       Kazuya Kawasaki, 
                                           (Author Unknown Productions)


Special Thanks to : Keisuke Fujii


== COPYING ==

Copyright (C) 1998  Author Unknown Productions


This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.

This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
GNU General Public License for more details.

You can get a copy of the GNU General Public License from the
website 
"http://www.gnu.org/copyleft/gpl.html"

if not, write to the Free Software Foundation, Inc., 675 Mass
Ave, Cambridge, MA 02139, USA.





diff -cr tkdesk-1.0/Makefile.in tkdesk-1.0_patched/Makefile.in
*** tkdesk-1.0/Makefile.in	Fri Feb 27 05:21:14 1998
--- tkdesk-1.0_patched/Makefile.in	Thu Apr 30 13:46:35 1998
***************
*** 50,56 ****
  
  # To change the compiler switches, for example to change from -O
  # to -g, change the following line:
! CC_OPTS = -O
  
  # To change the linker switches, for example to add -s,
  # change the following line:
--- 50,56 ----
  
  # To change the compiler switches, for example to change from -O
  # to -g, change the following line:
! CC_OPTS = -O2 -DKANJI -DKINPUT2
  
  # To change the linker switches, for example to add -s,
  # change the following line:
diff -cr tkdesk-1.0/configure tkdesk-1.0_patched/configure
*** tkdesk-1.0/configure	Fri Feb 27 05:21:14 1998
--- tkdesk-1.0_patched/configure	Thu Apr 30 13:46:50 1998
***************
*** 606,621 ****
  echo $ac_n "checking version of Tcl/Tk""... $ac_c" 1>&6
  echo "configure:608: checking version of Tcl/Tk" >&5
  echo "$ac_t""$TCL_VERSION/$TK_VERSION" 1>&6
! if test "$TCL_VERSION" != "7.5" -a "$TCL_VERSION" != "7.6"; then
    echo
!   echo TkDesk requires Tcl/Tk versions 7.5/4.1 or 7.6/4.2.
    echo Older versions are unlikely to work, while newer ones are not
    echo yet supported \(but hopefully will be soon\).
    exit 1
  fi
! if test "$TK_VERSION" != "4.1" -a "$TK_VERSION" != "4.2"; then
    echo
!   echo TkDesk requires Tcl/Tk versions 7.5/4.1 or 7.6/4.2.
    echo Older versions are unlikely to work, while newer ones are not
    echo yet supported \(but hopefully will be soon\).
    exit 1
--- 606,621 ----
  echo $ac_n "checking version of Tcl/Tk""... $ac_c" 1>&6
  echo "configure:608: checking version of Tcl/Tk" >&5
  echo "$ac_t""$TCL_VERSION/$TK_VERSION" 1>&6
! if test "$TCL_VERSION" != "7.5" -a "$TCL_VERSION" != "7.6" -a "$TCL_VERSION" != "7.6jp"; then
    echo
!   echo TkDesk requires Tcl/Tk versions 7.5/4.1 or 7.6/4.2 or 7.6jp/4.2jp.
    echo Older versions are unlikely to work, while newer ones are not
    echo yet supported \(but hopefully will be soon\).
    exit 1
  fi
! if test "$TK_VERSION" != "4.1" -a "$TK_VERSION" != "4.2" -a "$TK_VERSION" != "4.2jp"; then
    echo
!   echo TkDesk requires Tcl/Tk versions 7.5/4.1 or 7.6/4.2 or 7.6jp/4.2jp.
    echo Older versions are unlikely to work, while newer ones are not
    echo yet supported \(but hopefully will be soon\).
    exit 1
diff -cr tkdesk-1.0/tcldesk/cb_tools/bindings.tcl tkdesk-1.0_patched/tcldesk/cb_tools/bindings.tcl
*** tkdesk-1.0/tcldesk/cb_tools/bindings.tcl	Fri Feb 27 05:21:17 1998
--- tkdesk-1.0_patched/tcldesk/cb_tools/bindings.tcl	Thu Apr 30 13:50:45 1998
***************
*** 112,141 ****
  catch {bind Entry <bracketright> {tkEntryInsert %W \]}}
  catch {bind Entry <backslash> {tkEntryInsert %W \\}}
  catch {bind Entry <at> {tkEntryInsert %W @}}
- catch {bind Entry <mu> {tkEntryInsert %W }}
  catch {bind Entry <bar> {tkEntryInsert %W |}}
- catch {bind Entry <adiaeresis> {tkEntryInsert %W }}
- catch {bind Entry <odiaeresis> {tkEntryInsert %W }}
- catch {bind Entry <udiaeresis> {tkEntryInsert %W }}
- catch {bind Entry <Adiaeresis> {tkEntryInsert %W }}
- catch {bind Entry <Odiaeresis> {tkEntryInsert %W }}
- catch {bind Entry <Udiaeresis> {tkEntryInsert %W }}
- catch {
-     bind Entry <ssharp> {
- 	if {%s == 0} {
- 	    tkEntryInsert %W 
- 	} else {
- 	    tkEntryInsert %W \\
- 	}
-     }
- }
  
  # These might need to be commented out when using XKB:
  catch {bind Entry <asciitilde> {tkEntryInsert %W ~}}
  catch {bind Entry <grave> {tkEntryInsert %W `}}
  catch {bind Entry <dead_tilde> {tkEntryInsert %W ~}}
  catch {bind Entry <dead_grave> {tkEntryInsert %W `}}
- catch {bind Entry <dead_acute> {tkEntryInsert %W }}
  catch {bind Entry <dead_circumflex> {tkEntryInsert %W ^}}
  
  
--- 112,124 ----
***************
*** 153,185 ****
  	tkTextInsert %W \\}}
  catch {bind Text <at> {cb_Text_change_callback %W insert @; \
  	tkTextInsert %W @}}
- catch {bind Text <mu> {cb_Text_change_callback %W insert ; \
- 	tkTextInsert %W }}
  catch {bind Text <bar> {cb_Text_change_callback %W insert |; \
  	tkTextInsert %W |}}
- catch {bind Text <adiaeresis> {cb_Text_change_callback %W insert ; \
-         tkTextInsert %W }}
- catch {bind Text <odiaeresis> {cb_Text_change_callback %W insert ; \
-         tkTextInsert %W }}
- catch {bind Text <udiaeresis> {cb_Text_change_callback %W insert ; \
-         tkTextInsert %W }}
- catch {bind Text <Adiaeresis> {cb_Text_change_callback %W insert ; \
-         tkTextInsert %W }}
- catch {bind Text <Odiaeresis> {cb_Text_change_callback %W insert ; \
-         tkTextInsert %W }}
- catch {bind Text <Udiaeresis> {cb_Text_change_callback %W insert ; \
-         tkTextInsert %W }}
- catch {
-     bind Text <ssharp> {
- 	if {%s == 0} {
- 	    cb_Text_change_callback %W insert 
- 	    tkTextInsert %W 
- 	} else {
- 	    cb_Text_change_callback %W insert \\
- 	    tkTextInsert %W \\
- 	}
-     }
- }
  
  # These might need to be commented out when using XKB:
  catch {bind Text <asciitilde> {cb_Text_change_callback %W insert ~; \
--- 136,143 ----
***************
*** 190,197 ****
  	tkTextInsert %W ~}}
  catch {bind Text <dead_grave> {cb_Text_change_callback %W insert `; \
  	tkTextInsert %W `}}
- catch {bind Text <dead_acute> {cb_Text_change_callback %W insert ; \
- 	tkTextInsert %W }}
  catch {bind Text <dead_circumflex> {cb_Text_change_callback %W insert ^; \
  	tkTextInsert %W ^}}
  
--- 148,153 ----
***************
*** 279,285 ****
  	[bind Text <Return>]"
  bind Text <Tab> "cb_Text_change_callback %W insert <tab>; \
  	[bind Text <Tab>]"
- bind Text <mu> "cb_Text_change_callback %W insert ; [bind Text <mu>]"
  bind Text <Meta-BackSpace> "cb_Text_change_callback %W delete backchar; \
  	[bind Text <Meta-BackSpace>]"
  bind Text <Meta-Delete> "cb_Text_change_callback %W delete char; \
--- 235,240 ----
diff -cr tkdesk-1.0/tcldesk/config.tcl tkdesk-1.0_patched/tcldesk/config.tcl
*** tkdesk-1.0/tcldesk/config.tcl	Fri Feb 27 05:21:16 1998
--- tkdesk-1.0_patched/tcldesk/config.tcl	Thu Apr 30 13:47:26 1998
***************
*** 420,426 ****
--- 420,428 ----
      option add *Checkbutton.font [cb_font $tkdesk(font,labels)]
      option add *Radiobutton.font [cb_font $tkdesk(font,labels)]
      option add *Entry.font [cb_font $tkdesk(font,entries)]
+     option add *Entry.kanjiFont [cb_font $tkdesk(kanjiFont,entries)]
      option add *Text.font [cb_font $tkdesk(font,entries)]
+     option add *Text.kanjiFont [cb_font $tkdesk(kanjiFont,text)]
      option add *Button.font [cb_font $tkdesk(font,buttons)]
      option add *Menubutton.font [cb_font $tkdesk(font,menubuttons)]
      option add *Menu.font [cb_font $tkdesk(font,menus)]
diff -cr tkdesk-1.0/tcldesk/configs/System tkdesk-1.0_patched/tcldesk/configs/System
*** tkdesk-1.0/tcldesk/configs/System	Fri Feb 27 05:21:24 1998
--- tkdesk-1.0_patched/tcldesk/configs/System	Thu Apr 30 13:51:30 1998
***************
*** 67,73 ****
--- 67,75 ----
  
  ### Fonts for entries and text widgets (preferrably mono-spaced):
  set tkdesk(font,entries)      -*-lucidatypewriter-medium-r-*-*-12-*-*-*-*-*-*-*
+ set tkdesk(kanjiFont,entries) k14
  set tkdesk(font,text)         $tkdesk(font,entries)
+ set tkdesk(kanjiFont,text) k14
  
  ### A mono-spaced font for table-like output (disk usage etc.):
  set tkdesk(font,mono)         -*-lucidatypewriter-medium-r-*-*-12-*-*-*-*-*-*-*
***************
*** 175,180 ****
--- 177,183 ----
  ### The following settings are only for the built-in editor:
  
  set tkdesk(editor,font)		    $tkdesk(font,text)
+ set tkdesk(editor,kanjiFont)        $tkdesk(kanjiFont,text)
  set tkdesk(editor,print_command)    "lpr"
  set tkdesk(editor,default_geometry) "80x25"
  set tkdesk(editor,auto_indent) 1
