patches for emacspeak on gentoo linux

[William Hubbs <williamh@xxxxxxxxxxx>]

Hello all,

I am the maintainer for the emacspeak package on gentoo linux.
Recently, I was requested to make version 26 available.

One of our users reported some issues to me with emacspeak 26, and I
used his information to write patches against svn emacspeak.  I am
attaching them to this message, and I would like comments, or if it is
possible, could they be encorporated into the official source?

The first patch (emacspeak-makefile.patch) fixes the makefile so that the
directory servers/linux-espeak is included in the distribution.  The
second patch (emacspeak-espeak-fix.patch) fixes a compile error in the
tclespeak.cpp source file.  The third patch (emacspeak-tclx84.patch) converts
the tcl scripts to tcl/tclx 8.4, which is what gentoo is using.

Comments would be appreciated.

Thanks much,

-- 
William Hubbs
gentoo accessibility team lead
williamh@xxxxxxxxxxx

Index: Makefile
===================================================================
--- Makefile	(revision 4637)
+++ Makefile	(working copy)
@@ -194,7 +194,7 @@
 INFO = info/Makefile info/*.texi info/add-css.pl
 XSL=xsl
 DISTFILES =${ELISP}  ${TEMPLATES}     $(TCL_PROGRAMS) ${XSL} \
-${SAWFISH} ${OUTLOUD} ${DTKTTS} \
+${SAWFISH} ${OUTLOUD} ${DTKTTS} ${ESPEAK} \
 ${INFO} ${UGUIDE} ${IGUIDE} ${NEWS} ${MISC} Makefile
 
 # }}}

Index: servers/linux-espeak/tclespeak.cpp
===================================================================
--- servers/linux-espeak/tclespeak.cpp	(revision 4647)
+++ servers/linux-espeak/tclespeak.cpp	(working copy)
@@ -609,7 +609,7 @@
 getLangIndex (Tcl_Interp * interp, int* theIndex)
 {
   int aStatus = 0;
-  char* aInfo = Tcl_GetVar2(interp, "langsynth", "current", 0);
+  const char* aInfo = Tcl_GetVar2(interp, "langsynth", "current", 0);
   if (aInfo)
     {
       *theIndex = atoi(aInfo);

Index: servers/dsp-outloud
===================================================================
--- servers/dsp-outloud	(revision 4647)
+++ servers/dsp-outloud	(working copy)
@@ -1,4 +1,4 @@
-#!/usr/bin/tcl
+#!/usr/bin/tclsh
 # Keywords: Emacspeak, ViaVoice Outloud , TCL
 # {{{ LCD Entry: 
 
@@ -34,6 +34,7 @@
 # }}}
 # {{{source common code 
 
+package require Tclx
 set wd [file dirname $argv0]
 source $wd/tts-lib.tcl
 
Index: servers/ssh-outloud
===================================================================
--- servers/ssh-outloud	(revision 4647)
+++ servers/ssh-outloud	(working copy)
@@ -18,6 +18,7 @@
 #"do you want to continue connecting" question.
 
 # }}}
+package require Tclx
 set localhost [exec hostname]
 puts stderr "running on host <$localhost>"
 if [expr $argc == 0] {
Index: servers/dtk-soft
===================================================================
--- servers/dtk-soft	(revision 4647)
+++ servers/dtk-soft	(working copy)
@@ -1,4 +1,4 @@
-#!/usr/bin/tcl
+#!/usr/bin/tclsh
 # Keywords: Emacspeak, Software Dectalk , TCL
 # {{{ LCD Entry: 
 
@@ -35,6 +35,7 @@
 # }}}
 # {{{source common code 
 
+package require Tclx
 set wd [file dirname $argv0]
 source $wd/tts-lib.tcl
 set tts(old_rate) 0
Index: servers/outloud
===================================================================
--- servers/outloud	(revision 4647)
+++ servers/outloud	(working copy)
@@ -1,4 +1,4 @@
-#!/usr/bin/tcl
+#!/usr/bin/tclsh
 # Keywords: Emacspeak, ViaVoice Outloud , TCL
 # {{{ LCD Entry: 
 
@@ -487,7 +487,7 @@
 set tts(speech_rate)  75
 notes_initialize
 beep_initialize
-set tts(input) file0
+set tts(input) stdin
 if {[info exists server_p]} {
     set tts(input) sock0
 }
Index: servers/dtk-mv
===================================================================
--- servers/dtk-mv	(revision 4647)
+++ servers/dtk-mv	(working copy)
@@ -1,4 +1,4 @@
-#!/usr/bin/tcl
+#!/usr/bin/tclsh
 # $Id$
 # Description:  Interfacing to a Dectalk via TCL. 
 # Keywords: Emacspeak, Dectalk, TCL
@@ -58,6 +58,8 @@
 # }}}
 # {{{ procedures  
 
+package require Tclx
+
 proc tts_set_punctuations {mode} {
     global tts
     set tts(punctuations) $mode
@@ -559,13 +561,13 @@
 # {{{ Initialize and set state.
 
 #working around tcl 7.5
-set tts(input) file0
+set tts(input) stdin
 if {[string match [info tclversion] 7.5]
 || [string match 8.0 [info tclversion]] } {
     if {[info exists server_p]} {
         set tts(input) sock0
     } else {
-        set tts(input) file0
+        set tts(input) stdin
     }
 }
 
Index: servers/ssh-tts
===================================================================
--- servers/ssh-tts	(revision 4647)
+++ servers/ssh-tts	(working copy)
@@ -1,4 +1,4 @@
-#!/usr/bin/tcl
+#!/usr/bin/tclsh
 #$Id$
 #Description: Launch a TTS server on a remote host.
 #Copyright (C) 1995 -- 2007, T. V. Raman 
@@ -18,6 +18,7 @@
 #"do you want to continue connecting" question.
 
 # }}}
+package require Tclx
 set localhost [exec hostname]
 puts stderr "running on host <$localhost>"
 if [expr $argc == 0] {
Index: servers/ssh-dtk-exp
===================================================================
--- servers/ssh-dtk-exp	(revision 4647)
+++ servers/ssh-dtk-exp	(working copy)
@@ -1,4 +1,4 @@
-#!/usr/bin/tcl
+#!/usr/bin/tclsh
 #$Id$
 #Description: Launch a TTS server on a remote host.
 #Copyright (C) 1995 -- 2007, T. V. Raman 
@@ -18,6 +18,7 @@
 #"do you want to continue connecting" question.
 
 # }}}
+package require Tclx
 set localhost [exec hostname]
 puts stderr "running on host <$localhost>"
 if [expr $argc == 0] {
Index: servers/espeak
===================================================================
--- servers/espeak	(revision 4647)
+++ servers/espeak	(working copy)
@@ -1,4 +1,4 @@
-#!/usr/bin/tcl
+#!/usr/bin/tclsh
 # Keywords: Emacspeak, eSpeak , TCL
 # {{{ LCD Entry: 
 
@@ -34,6 +34,7 @@
 # }}}
 # {{{source common code 
 
+package require Tclx
 set wd [file dirname $argv0]
 source $wd/tts-lib.tcl
 
@@ -524,7 +525,7 @@
 set tts(speech_rate)  225
 notes_initialize
 beep_initialize
-set tts(input) file0
+set tts(input) stdin
 if {[info exists server_p]} {
     set tts(input) sock0
 }
Index: servers/ssh-dsp-outloud
===================================================================
--- servers/ssh-dsp-outloud	(revision 4647)
+++ servers/ssh-dsp-outloud	(working copy)
@@ -1,4 +1,4 @@
-#!/usr/bin/tcl
+#!/usr/bin/tclsh
 #$Id$
 #Description: Launch a TTS server on a remote host.
 #Copyright (C) 1995 -- 2007, T. V. Raman 
@@ -18,6 +18,7 @@
 #"do you want to continue connecting" question.
 
 # }}}
+package require Tclx
 set localhost [exec hostname]
 puts stderr "running on host <$localhost>"
 if [expr $argc == 0] {
Index: servers/speech-server
===================================================================
--- servers/speech-server	(revision 4647)
+++ servers/speech-server	(working copy)
@@ -1,4 +1,4 @@
-#!/usr/bin/tcl
+#!/usr/bin/tclsh
 # $Id$
 # Description:  Speech server
 #Usage: tcl speech-server port device-specific-script
Index: servers/dtk-exp
===================================================================
--- servers/dtk-exp	(revision 4647)
+++ servers/dtk-exp	(working copy)
@@ -1,4 +1,4 @@
-#!/usr/bin/tcl
+#!/usr/bin/tclsh
 # $Id$
 # Description:  Interfacing to a Dectalk via TCL.
 # Keywords: Emacspeak, Dectalk, TCL
@@ -58,6 +58,7 @@
 # }}}
 # {{{source common code
 
+package require Tclx
 set wd [file dirname $argv0]
 source $wd/tts-lib.tcl
 # }}}
@@ -420,7 +421,7 @@
 set tts(say_rate) [round \
                        [expr $tts(speech_rate) * $tts(char_factor)]]
 notes_initialize
-set tts(input) file0
+set tts(input) stdin
 if {[info exists server_p]} {
     set tts(input) sock0
 }

Attachment: pgpnOSGZCqjdA.pgp
Description: PGP signature