[Tux4kids-commits] r187 - in tuxtype/trunk: . tuxtype tuxtype/data/themes/jamaican/words tuxtype/docs/en
dbruce-guest at alioth.debian.org
dbruce-guest at alioth.debian.org
Sun Jun 17 02:12:58 UTC 2007
Author: dbruce-guest
Date: 2007-06-17 02:12:57 +0000 (Sun, 17 Jun 2007)
New Revision: 187
Added:
tuxtype/trunk/tuxtype/ConvertUTF.c
tuxtype/trunk/tuxtype/ConvertUTF.h
Modified:
tuxtype/trunk/AUTHORS
tuxtype/trunk/ChangeLog
tuxtype/trunk/configure
tuxtype/trunk/configure.ac
tuxtype/trunk/tuxtype/Makefile.am
tuxtype/trunk/tuxtype/Makefile.in
tuxtype/trunk/tuxtype/alphabet.c
tuxtype/trunk/tuxtype/data/themes/jamaican/words/jam-long.txt
tuxtype/trunk/tuxtype/data/themes/jamaican/words/jam-med.txt
tuxtype/trunk/tuxtype/data/themes/jamaican/words/jam-short.txt
tuxtype/trunk/tuxtype/docs/en/howtotheme.html
tuxtype/trunk/tuxtype/main.c
Log:
Using ConvertUTF.c from Unicode, Inc. for encoding conversions.
Modified: tuxtype/trunk/AUTHORS
===================================================================
--- tuxtype/trunk/AUTHORS 2007-06-15 09:55:25 UTC (rev 186)
+++ tuxtype/trunk/AUTHORS 2007-06-17 02:12:57 UTC (rev 187)
@@ -1,5 +1,6 @@
Coders:
-------
+David Bruce <dbruce at tampabay.rr.com>
Jesse Andrews <jdandr2 at uky.edu>
Calvin Arndt <calarndt at tux4kids.org>
Sam Hart <hart at geekcomix.com> --- Sam started it all with TuxType 1!!!
@@ -7,6 +8,8 @@
Packaging & Ports:
------------------
+Holger Levsen <debian at layer-acht.org> - (Debian packager, project maintainer)
+David Bruce <dbruce at tampabay.rr.com> - (Windows crossbuild using Linux host)
David Marshman <marshy at silvan.demon.co.uk> - (BeOS port/packages)
Calvin Arndt <calarndt at yahoo.com> - (Red Hat 7.1+ RPMs)
Olivier Dagenais <olivier_dagenais at canada.com> - (Windows port/packages)
@@ -21,3 +24,12 @@
Martin Rioux <riomar2000 at hotmail.com> - (for French translation in TuxType 1)
Karl Ove Hufthammer <karl at huftis.org> - (for Norwegian Nynorsk translation work for Tuxtype 2)
Trond Mæhlum <trondm at skolelinux.no> - (for Norwegian Bokmål translation work for Tuxtype 2)
+
+
+Note: ConvertUTF.c/.h are from Unicode, Inc. and are released under a very free (BSD-like) license:
+
+ "Unicode, Inc. hereby grants the right to freely use the information
+ supplied in this file in the creation of products supporting the
+ Unicode Standard, and to make copies of this file in any form
+ for internal or external distribution as long as this notice
+ remains attached."
\ No newline at end of file
Modified: tuxtype/trunk/ChangeLog
===================================================================
--- tuxtype/trunk/ChangeLog 2007-06-15 09:55:25 UTC (rev 186)
+++ tuxtype/trunk/ChangeLog 2007-06-17 02:12:57 UTC (rev 187)
@@ -1,12 +1,21 @@
+v 1.5.10 - 16 Jun 2007
+[ David Bruce ]
+ - Added ConvertUTF.c & .h from Unicode, Inc. to do UTF-8 to wcs
+ encoding conversion when glibc isn't present (i.e., in Windows
+ build). AFAICT, Windows build now handles UTF-8/Unicode properly,
+ or at least behaves the same as *nix build.
+ - Fixed Jamaican theme - words in list needed to be uppercase.
+ - Correct links in HowToTheme.html to current counterparts.
+
15 Jun 2007
-[ David Bruce]
+[ David Bruce ]
- Comet Zap fixed to require player to type letters in proper
order - "shootable" flag added to comet type.
- More code cleanup - mostly adding checks to prevent dereferencing
of null or invalid pointers.
07 Jun 2007
-[ David Bruce]
+[ David Bruce ]
- Code cleanup - funcs.h revised, unneeded "extern" keywords for
function prototypes removed, prototypes rearranged into alpha-
betical order
@@ -20,7 +29,7 @@
local_functions() use lowercase connected by underscores).
29 May 2007
-[ David Bruce]
+[ David Bruce ]
- Fixed vertical alignment problem with certain non-US characters
such as "Å" by checking max_y of each glyph and adjusting
appropriately.
@@ -32,7 +41,7 @@
keyboard.lst file says.
24 May 2007
-[ David Bruce]
+[ David Bruce ]
- Additional work on UTF-8/Unicode issues - program now scans
word list to see what Unicode characters are needed instead
of automatically rendering everything from 0-255. It now
@@ -48,7 +57,7 @@
v.1.5.9 07 May 2007
-[ David Bruce]
+[ David Bruce ]
- Overhauled internal handling of word lists to handle UTF-8
correctly. Now WORDS_use() converts the UTF-8 to wchar_t
(i.e. Unicode) arrays for internal handling. The letters for
@@ -67,7 +76,7 @@
- Added Brazilian Portuguese translation by
Hudson Gonçalves Manieri Figueredo.
-[ David Bruce]
+[ David Bruce ]
- Changed TTF_RenderText to TTF_RenderUTF8 everywhere in
playgame.c, mainly by removing ttf_letter() and using
black_outline() instead.
Modified: tuxtype/trunk/configure
===================================================================
--- tuxtype/trunk/configure 2007-06-15 09:55:25 UTC (rev 186)
+++ tuxtype/trunk/configure 2007-06-17 02:12:57 UTC (rev 187)
@@ -4167,6 +4167,7 @@
if test "$native_win32" = yes; then
+
cat >>confdefs.h <<\_ACEOF
#define BUILD_MINGW32 1
_ACEOF
Modified: tuxtype/trunk/configure.ac
===================================================================
--- tuxtype/trunk/configure.ac 2007-06-15 09:55:25 UTC (rev 186)
+++ tuxtype/trunk/configure.ac 2007-06-17 02:12:57 UTC (rev 187)
@@ -1,9 +1,9 @@
# Process this file with autoconf to produce a configure script.
-AC_INIT(tuxtype, 1.5.9, tuxmath-devel at lists.sourceforge.net)
+AC_INIT(tuxtype, 1.5.10, tuxmath-devel at lists.sourceforge.net)
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(tuxtype, 1.5.9)
+AM_INIT_AUTOMAKE(tuxtype, 1.5.10)
AC_CONFIG_SRCDIR([tuxtype/funcs.h])
@@ -59,6 +59,7 @@
AM_CONDITIONAL(BUILD_MINGW32, test "$native_win32" = yes)
if test "$native_win32" = yes; then
+
AC_DEFINE([BUILD_MINGW32], 1,[Native MinGW32 build])
CFLAGS="$CFLAGS -D__GW32__"
LIBS="-lmingw32 -lSDLmain $LIBS -lgw32c -luuid -lole32 -lwsock32 -mwindows"
Added: tuxtype/trunk/tuxtype/ConvertUTF.c
===================================================================
--- tuxtype/trunk/tuxtype/ConvertUTF.c (rev 0)
+++ tuxtype/trunk/tuxtype/ConvertUTF.c 2007-06-17 02:12:57 UTC (rev 187)
@@ -0,0 +1,539 @@
+/*
+ * Copyright 2001-2004 Unicode, Inc.
+ *
+ * Disclaimer
+ *
+ * This source code is provided as is by Unicode, Inc. No claims are
+ * made as to fitness for any particular purpose. No warranties of any
+ * kind are expressed or implied. The recipient agrees to determine
+ * applicability of information provided. If this file has been
+ * purchased on magnetic or optical media from Unicode, Inc., the
+ * sole remedy for any claim will be exchange of defective media
+ * within 90 days of receipt.
+ *
+ * Limitations on Rights to Redistribute This Code
+ *
+ * Unicode, Inc. hereby grants the right to freely use the information
+ * supplied in this file in the creation of products supporting the
+ * Unicode Standard, and to make copies of this file in any form
+ * for internal or external distribution as long as this notice
+ * remains attached.
+ */
+
+/* ---------------------------------------------------------------------
+
+ Conversions between UTF32, UTF-16, and UTF-8. Source code file.
+ Author: Mark E. Davis, 1994.
+ Rev History: Rick McGowan, fixes & updates May 2001.
+ Sept 2001: fixed const & error conditions per
+ mods suggested by S. Parent & A. Lillich.
+ June 2002: Tim Dodd added detection and handling of incomplete
+ source sequences, enhanced error detection, added casts
+ to eliminate compiler warnings.
+ July 2003: slight mods to back out aggressive FFFE detection.
+ Jan 2004: updated switches in from-UTF8 conversions.
+ Oct 2004: updated to use UNI_MAX_LEGAL_UTF32 in UTF-32 conversions.
+
+ See the header file "ConvertUTF.h" for complete documentation.
+
+------------------------------------------------------------------------ */
+
+
+#include "ConvertUTF.h"
+#ifdef CVTUTF_DEBUG
+#include <stdio.h>
+#endif
+
+static const int halfShift = 10; /* used for shifting by 10 bits */
+
+static const UTF32 halfBase = 0x0010000UL;
+static const UTF32 halfMask = 0x3FFUL;
+
+#define UNI_SUR_HIGH_START (UTF32)0xD800
+#define UNI_SUR_HIGH_END (UTF32)0xDBFF
+#define UNI_SUR_LOW_START (UTF32)0xDC00
+#define UNI_SUR_LOW_END (UTF32)0xDFFF
+#define false 0
+#define true 1
+
+/* --------------------------------------------------------------------- */
+
+ConversionResult ConvertUTF32toUTF16 (
+ const UTF32** sourceStart, const UTF32* sourceEnd,
+ UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags) {
+ ConversionResult result = conversionOK;
+ const UTF32* source = *sourceStart;
+ UTF16* target = *targetStart;
+ while (source < sourceEnd) {
+ UTF32 ch;
+ if (target >= targetEnd) {
+ result = targetExhausted; break;
+ }
+ ch = *source++;
+ if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */
+ /* UTF-16 surrogate values are illegal in UTF-32; 0xffff or 0xfffe are both reserved values */
+ if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
+ if (flags == strictConversion) {
+ --source; /* return to the illegal value itself */
+ result = sourceIllegal;
+ break;
+ } else {
+ *target++ = UNI_REPLACEMENT_CHAR;
+ }
+ } else {
+ *target++ = (UTF16)ch; /* normal case */
+ }
+ } else if (ch > UNI_MAX_LEGAL_UTF32) {
+ if (flags == strictConversion) {
+ result = sourceIllegal;
+ } else {
+ *target++ = UNI_REPLACEMENT_CHAR;
+ }
+ } else {
+ /* target is a character in range 0xFFFF - 0x10FFFF. */
+ if (target + 1 >= targetEnd) {
+ --source; /* Back up source pointer! */
+ result = targetExhausted; break;
+ }
+ ch -= halfBase;
+ *target++ = (UTF16)((ch >> halfShift) + UNI_SUR_HIGH_START);
+ *target++ = (UTF16)((ch & halfMask) + UNI_SUR_LOW_START);
+ }
+ }
+ *sourceStart = source;
+ *targetStart = target;
+ return result;
+}
+
+/* --------------------------------------------------------------------- */
+
+ConversionResult ConvertUTF16toUTF32 (
+ const UTF16** sourceStart, const UTF16* sourceEnd,
+ UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags) {
+ ConversionResult result = conversionOK;
+ const UTF16* source = *sourceStart;
+ UTF32* target = *targetStart;
+ UTF32 ch, ch2;
+ while (source < sourceEnd) {
+ const UTF16* oldSource = source; /* In case we have to back up because of target overflow. */
+ ch = *source++;
+ /* If we have a surrogate pair, convert to UTF32 first. */
+ if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_HIGH_END) {
+ /* If the 16 bits following the high surrogate are in the source buffer... */
+ if (source < sourceEnd) {
+ ch2 = *source;
+ /* If it's a low surrogate, convert to UTF32. */
+ if (ch2 >= UNI_SUR_LOW_START && ch2 <= UNI_SUR_LOW_END) {
+ ch = ((ch - UNI_SUR_HIGH_START) << halfShift)
+ + (ch2 - UNI_SUR_LOW_START) + halfBase;
+ ++source;
+ } else if (flags == strictConversion) { /* it's an unpaired high surrogate */
+ --source; /* return to the illegal value itself */
+ result = sourceIllegal;
+ break;
+ }
+ } else { /* We don't have the 16 bits following the high surrogate. */
+ --source; /* return to the high surrogate */
+ result = sourceExhausted;
+ break;
+ }
+ } else if (flags == strictConversion) {
+ /* UTF-16 surrogate values are illegal in UTF-32 */
+ if (ch >= UNI_SUR_LOW_START && ch <= UNI_SUR_LOW_END) {
+ --source; /* return to the illegal value itself */
+ result = sourceIllegal;
+ break;
+ }
+ }
+ if (target >= targetEnd) {
+ source = oldSource; /* Back up source pointer! */
+ result = targetExhausted; break;
+ }
+ *target++ = ch;
+ }
+ *sourceStart = source;
+ *targetStart = target;
+#ifdef CVTUTF_DEBUG
+if (result == sourceIllegal) {
+ fprintf(stderr, "ConvertUTF16toUTF32 illegal seq 0x%04x,%04x\n", ch, ch2);
+ fflush(stderr);
+}
+#endif
+ return result;
+}
+
+/* --------------------------------------------------------------------- */
+
+/*
+ * Index into the table below with the first byte of a UTF-8 sequence to
+ * get the number of trailing bytes that are supposed to follow it.
+ * Note that *legal* UTF-8 values can't have 4 or 5-bytes. The table is
+ * left as-is for anyone who may want to do such conversion, which was
+ * allowed in earlier algorithms.
+ */
+static const char trailingBytesForUTF8[256] = {
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,
+ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1, 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,
+ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2, 3,3,3,3,3,3,3,3,4,4,4,4,5,5,5,5
+};
+
+/*
+ * Magic values subtracted from a buffer value during UTF8 conversion.
+ * This table contains as many values as there might be trailing bytes
+ * in a UTF-8 sequence.
+ */
+static const UTF32 offsetsFromUTF8[6] = { 0x00000000UL, 0x00003080UL, 0x000E2080UL,
+ 0x03C82080UL, 0xFA082080UL, 0x82082080UL };
+
+/*
+ * Once the bits are split out into bytes of UTF-8, this is a mask OR-ed
+ * into the first byte, depending on how many bytes follow. There are
+ * as many entries in this table as there are UTF-8 sequence types.
+ * (I.e., one byte sequence, two byte... etc.). Remember that sequencs
+ * for *legal* UTF-8 will be 4 or fewer bytes total.
+ */
+static const UTF8 firstByteMark[7] = { 0x00, 0x00, 0xC0, 0xE0, 0xF0, 0xF8, 0xFC };
+
+/* --------------------------------------------------------------------- */
+
+/* The interface converts a whole buffer to avoid function-call overhead.
+ * Constants have been gathered. Loops & conditionals have been removed as
+ * much as possible for efficiency, in favor of drop-through switches.
+ * (See "Note A" at the bottom of the file for equivalent code.)
+ * If your compiler supports it, the "isLegalUTF8" call can be turned
+ * into an inline function.
+ */
+
+/* --------------------------------------------------------------------- */
+
+ConversionResult ConvertUTF16toUTF8 (
+ const UTF16** sourceStart, const UTF16* sourceEnd,
+ UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags) {
+ ConversionResult result = conversionOK;
+ const UTF16* source = *sourceStart;
+ UTF8* target = *targetStart;
+ while (source < sourceEnd) {
+ UTF32 ch;
+ unsigned short bytesToWrite = 0;
+ const UTF32 byteMask = 0xBF;
+ const UTF32 byteMark = 0x80;
+ const UTF16* oldSource = source; /* In case we have to back up because of target overflow. */
+ ch = *source++;
+ /* If we have a surrogate pair, convert to UTF32 first. */
+ if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_HIGH_END) {
+ /* If the 16 bits following the high surrogate are in the source buffer... */
+ if (source < sourceEnd) {
+ UTF32 ch2 = *source;
+ /* If it's a low surrogate, convert to UTF32. */
+ if (ch2 >= UNI_SUR_LOW_START && ch2 <= UNI_SUR_LOW_END) {
+ ch = ((ch - UNI_SUR_HIGH_START) << halfShift)
+ + (ch2 - UNI_SUR_LOW_START) + halfBase;
+ ++source;
+ } else if (flags == strictConversion) { /* it's an unpaired high surrogate */
+ --source; /* return to the illegal value itself */
+ result = sourceIllegal;
+ break;
+ }
+ } else { /* We don't have the 16 bits following the high surrogate. */
+ --source; /* return to the high surrogate */
+ result = sourceExhausted;
+ break;
+ }
+ } else if (flags == strictConversion) {
+ /* UTF-16 surrogate values are illegal in UTF-32 */
+ if (ch >= UNI_SUR_LOW_START && ch <= UNI_SUR_LOW_END) {
+ --source; /* return to the illegal value itself */
+ result = sourceIllegal;
+ break;
+ }
+ }
+ /* Figure out how many bytes the result will require */
+ if (ch < (UTF32)0x80) { bytesToWrite = 1;
+ } else if (ch < (UTF32)0x800) { bytesToWrite = 2;
+ } else if (ch < (UTF32)0x10000) { bytesToWrite = 3;
+ } else if (ch < (UTF32)0x110000) { bytesToWrite = 4;
+ } else { bytesToWrite = 3;
+ ch = UNI_REPLACEMENT_CHAR;
+ }
+
+ target += bytesToWrite;
+ if (target > targetEnd) {
+ source = oldSource; /* Back up source pointer! */
+ target -= bytesToWrite; result = targetExhausted; break;
+ }
+ switch (bytesToWrite) { /* note: everything falls through. */
+ case 4: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
+ case 3: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
+ case 2: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
+ case 1: *--target = (UTF8)(ch | firstByteMark[bytesToWrite]);
+ }
+ target += bytesToWrite;
+ }
+ *sourceStart = source;
+ *targetStart = target;
+ return result;
+}
+
+/* --------------------------------------------------------------------- */
+
+/*
+ * Utility routine to tell whether a sequence of bytes is legal UTF-8.
+ * This must be called with the length pre-determined by the first byte.
+ * If not calling this from ConvertUTF8to*, then the length can be set by:
+ * length = trailingBytesForUTF8[*source]+1;
+ * and the sequence is illegal right away if there aren't that many bytes
+ * available.
+ * If presented with a length > 4, this returns false. The Unicode
+ * definition of UTF-8 goes up to 4-byte sequences.
+ */
+
+static Boolean isLegalUTF8(const UTF8 *source, int length) {
+ UTF8 a;
+ const UTF8 *srcptr = source+length;
+ switch (length) {
+ default: return false;
+ /* Everything else falls through when "true"... */
+ case 4: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
+ case 3: if ((a = (*--srcptr)) < 0x80 || a > 0xBF) return false;
+ case 2: if ((a = (*--srcptr)) > 0xBF) return false;
+
+ switch (*source) {
+ /* no fall-through in this inner switch */
+ case 0xE0: if (a < 0xA0) return false; break;
+ case 0xED: if (a > 0x9F) return false; break;
+ case 0xF0: if (a < 0x90) return false; break;
+ case 0xF4: if (a > 0x8F) return false; break;
+ default: if (a < 0x80) return false;
+ }
+
+ case 1: if (*source >= 0x80 && *source < 0xC2) return false;
+ }
+ if (*source > 0xF4) return false;
+ return true;
+}
+
+/* --------------------------------------------------------------------- */
+
+/*
+ * Exported function to return whether a UTF-8 sequence is legal or not.
+ * This is not used here; it's just exported.
+ */
+Boolean isLegalUTF8Sequence(const UTF8 *source, const UTF8 *sourceEnd) {
+ int length = trailingBytesForUTF8[*source]+1;
+ if (source+length > sourceEnd) {
+ return false;
+ }
+ return isLegalUTF8(source, length);
+}
+
+/* --------------------------------------------------------------------- */
+
+ConversionResult ConvertUTF8toUTF16 (
+ const UTF8** sourceStart, const UTF8* sourceEnd,
+ UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags) {
+ ConversionResult result = conversionOK;
+ const UTF8* source = *sourceStart;
+ UTF16* target = *targetStart;
+ while (source < sourceEnd) {
+ UTF32 ch = 0;
+ unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
+ if (source + extraBytesToRead >= sourceEnd) {
+ result = sourceExhausted; break;
+ }
+ /* Do this check whether lenient or strict */
+ if (! isLegalUTF8(source, extraBytesToRead+1)) {
+ result = sourceIllegal;
+ break;
+ }
+ /*
+ * The cases all fall through. See "Note A" below.
+ */
+ switch (extraBytesToRead) {
+ case 5: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
+ case 4: ch += *source++; ch <<= 6; /* remember, illegal UTF-8 */
+ case 3: ch += *source++; ch <<= 6;
+ case 2: ch += *source++; ch <<= 6;
+ case 1: ch += *source++; ch <<= 6;
+ case 0: ch += *source++;
+ }
+ ch -= offsetsFromUTF8[extraBytesToRead];
+
+ if (target >= targetEnd) {
+ source -= (extraBytesToRead+1); /* Back up source pointer! */
+ result = targetExhausted; break;
+ }
+ if (ch <= UNI_MAX_BMP) { /* Target is a character <= 0xFFFF */
+ /* UTF-16 surrogate values are illegal in UTF-32 */
+ if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
+ if (flags == strictConversion) {
+ source -= (extraBytesToRead+1); /* return to the illegal value itself */
+ result = sourceIllegal;
+ break;
+ } else {
+ *target++ = UNI_REPLACEMENT_CHAR;
+ }
+ } else {
+ *target++ = (UTF16)ch; /* normal case */
+ }
+ } else if (ch > UNI_MAX_UTF16) {
+ if (flags == strictConversion) {
+ result = sourceIllegal;
+ source -= (extraBytesToRead+1); /* return to the start */
+ break; /* Bail out; shouldn't continue */
+ } else {
+ *target++ = UNI_REPLACEMENT_CHAR;
+ }
+ } else {
+ /* target is a character in range 0xFFFF - 0x10FFFF. */
+ if (target + 1 >= targetEnd) {
+ source -= (extraBytesToRead+1); /* Back up source pointer! */
+ result = targetExhausted; break;
+ }
+ ch -= halfBase;
+ *target++ = (UTF16)((ch >> halfShift) + UNI_SUR_HIGH_START);
+ *target++ = (UTF16)((ch & halfMask) + UNI_SUR_LOW_START);
+ }
+ }
+ *sourceStart = source;
+ *targetStart = target;
+ return result;
+}
+
+/* --------------------------------------------------------------------- */
+
+ConversionResult ConvertUTF32toUTF8 (
+ const UTF32** sourceStart, const UTF32* sourceEnd,
+ UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags) {
+ ConversionResult result = conversionOK;
+ const UTF32* source = *sourceStart;
+ UTF8* target = *targetStart;
+ while (source < sourceEnd) {
+ UTF32 ch;
+ unsigned short bytesToWrite = 0;
+ const UTF32 byteMask = 0xBF;
+ const UTF32 byteMark = 0x80;
+ ch = *source++;
+ if (flags == strictConversion ) {
+ /* UTF-16 surrogate values are illegal in UTF-32 */
+ if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
+ --source; /* return to the illegal value itself */
+ result = sourceIllegal;
+ break;
+ }
+ }
+ /*
+ * Figure out how many bytes the result will require. Turn any
+ * illegally large UTF32 things (> Plane 17) into replacement chars.
+ */
+ if (ch < (UTF32)0x80) { bytesToWrite = 1;
+ } else if (ch < (UTF32)0x800) { bytesToWrite = 2;
+ } else if (ch < (UTF32)0x10000) { bytesToWrite = 3;
+ } else if (ch <= UNI_MAX_LEGAL_UTF32) { bytesToWrite = 4;
+ } else { bytesToWrite = 3;
+ ch = UNI_REPLACEMENT_CHAR;
+ result = sourceIllegal;
+ }
+
+ target += bytesToWrite;
+ if (target > targetEnd) {
+ --source; /* Back up source pointer! */
+ target -= bytesToWrite; result = targetExhausted; break;
+ }
+ switch (bytesToWrite) { /* note: everything falls through. */
+ case 4: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
+ case 3: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
+ case 2: *--target = (UTF8)((ch | byteMark) & byteMask); ch >>= 6;
+ case 1: *--target = (UTF8) (ch | firstByteMark[bytesToWrite]);
+ }
+ target += bytesToWrite;
+ }
+ *sourceStart = source;
+ *targetStart = target;
+ return result;
+}
+
+/* --------------------------------------------------------------------- */
+
+ConversionResult ConvertUTF8toUTF32 (
+ const UTF8** sourceStart, const UTF8* sourceEnd,
+ UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags) {
+ ConversionResult result = conversionOK;
+ const UTF8* source = *sourceStart;
+ UTF32* target = *targetStart;
+ while (source < sourceEnd) {
+ UTF32 ch = 0;
+ unsigned short extraBytesToRead = trailingBytesForUTF8[*source];
+ if (source + extraBytesToRead >= sourceEnd) {
+ result = sourceExhausted; break;
+ }
+ /* Do this check whether lenient or strict */
+ if (! isLegalUTF8(source, extraBytesToRead+1)) {
+ result = sourceIllegal;
+ break;
+ }
+ /*
+ * The cases all fall through. See "Note A" below.
+ */
+ switch (extraBytesToRead) {
+ case 5: ch += *source++; ch <<= 6;
+ case 4: ch += *source++; ch <<= 6;
+ case 3: ch += *source++; ch <<= 6;
+ case 2: ch += *source++; ch <<= 6;
+ case 1: ch += *source++; ch <<= 6;
+ case 0: ch += *source++;
+ }
+ ch -= offsetsFromUTF8[extraBytesToRead];
+
+ if (target >= targetEnd) {
+ source -= (extraBytesToRead+1); /* Back up the source pointer! */
+ result = targetExhausted; break;
+ }
+ if (ch <= UNI_MAX_LEGAL_UTF32) {
+ /*
+ * UTF-16 surrogate values are illegal in UTF-32, and anything
+ * over Plane 17 (> 0x10FFFF) is illegal.
+ */
+ if (ch >= UNI_SUR_HIGH_START && ch <= UNI_SUR_LOW_END) {
+ if (flags == strictConversion) {
+ source -= (extraBytesToRead+1); /* return to the illegal value itself */
+ result = sourceIllegal;
+ break;
+ } else {
+ *target++ = UNI_REPLACEMENT_CHAR;
+ }
+ } else {
+ *target++ = ch;
+ }
+ } else { /* i.e., ch > UNI_MAX_LEGAL_UTF32 */
+ result = sourceIllegal;
+ *target++ = UNI_REPLACEMENT_CHAR;
+ }
+ }
+ *sourceStart = source;
+ *targetStart = target;
+ return result;
+}
+
+/* ---------------------------------------------------------------------
+
+ Note A.
+ The fall-through switches in UTF-8 reading code save a
+ temp variable, some decrements & conditionals. The switches
+ are equivalent to the following loop:
+ {
+ int tmpBytesToRead = extraBytesToRead+1;
+ do {
+ ch += *source++;
+ --tmpBytesToRead;
+ if (tmpBytesToRead) ch <<= 6;
+ } while (tmpBytesToRead > 0);
+ }
+ In UTF-8 writing code, the switches on "bytesToWrite" are
+ similarly unrolled loops.
+
+ --------------------------------------------------------------------- */
Added: tuxtype/trunk/tuxtype/ConvertUTF.h
===================================================================
--- tuxtype/trunk/tuxtype/ConvertUTF.h (rev 0)
+++ tuxtype/trunk/tuxtype/ConvertUTF.h 2007-06-17 02:12:57 UTC (rev 187)
@@ -0,0 +1,149 @@
+/*
+ * Copyright 2001-2004 Unicode, Inc.
+ *
+ * Disclaimer
+ *
+ * This source code is provided as is by Unicode, Inc. No claims are
+ * made as to fitness for any particular purpose. No warranties of any
+ * kind are expressed or implied. The recipient agrees to determine
+ * applicability of information provided. If this file has been
+ * purchased on magnetic or optical media from Unicode, Inc., the
+ * sole remedy for any claim will be exchange of defective media
+ * within 90 days of receipt.
+ *
+ * Limitations on Rights to Redistribute This Code
+ *
+ * Unicode, Inc. hereby grants the right to freely use the information
+ * supplied in this file in the creation of products supporting the
+ * Unicode Standard, and to make copies of this file in any form
+ * for internal or external distribution as long as this notice
+ * remains attached.
+ */
+
+/* ---------------------------------------------------------------------
+
+ Conversions between UTF32, UTF-16, and UTF-8. Header file.
+
+ Several funtions are included here, forming a complete set of
+ conversions between the three formats. UTF-7 is not included
+ here, but is handled in a separate source file.
+
+ Each of these routines takes pointers to input buffers and output
+ buffers. The input buffers are const.
+
+ Each routine converts the text between *sourceStart and sourceEnd,
+ putting the result into the buffer between *targetStart and
+ targetEnd. Note: the end pointers are *after* the last item: e.g.
+ *(sourceEnd - 1) is the last item.
+
+ The return result indicates whether the conversion was successful,
+ and if not, whether the problem was in the source or target buffers.
+ (Only the first encountered problem is indicated.)
+
+ After the conversion, *sourceStart and *targetStart are both
+ updated to point to the end of last text successfully converted in
+ the respective buffers.
+
+ Input parameters:
+ sourceStart - pointer to a pointer to the source buffer.
+ The contents of this are modified on return so that
+ it points at the next thing to be converted.
+ targetStart - similarly, pointer to pointer to the target buffer.
+ sourceEnd, targetEnd - respectively pointers to the ends of the
+ two buffers, for overflow checking only.
+
+ These conversion functions take a ConversionFlags argument. When this
+ flag is set to strict, both irregular sequences and isolated surrogates
+ will cause an error. When the flag is set to lenient, both irregular
+ sequences and isolated surrogates are converted.
+
+ Whether the flag is strict or lenient, all illegal sequences will cause
+ an error return. This includes sequences such as: <F4 90 80 80>, <C0 80>,
+ or <A0> in UTF-8, and values above 0x10FFFF in UTF-32. Conformant code
+ must check for illegal sequences.
+
+ When the flag is set to lenient, characters over 0x10FFFF are converted
+ to the replacement character; otherwise (when the flag is set to strict)
+ they constitute an error.
+
+ Output parameters:
+ The value "sourceIllegal" is returned from some routines if the input
+ sequence is malformed. When "sourceIllegal" is returned, the source
+ value will point to the illegal value that caused the problem. E.g.,
+ in UTF-8 when a sequence is malformed, it points to the start of the
+ malformed sequence.
+
+ Author: Mark E. Davis, 1994.
+ Rev History: Rick McGowan, fixes & updates May 2001.
+ Fixes & updates, Sept 2001.
+
+------------------------------------------------------------------------ */
+
+/* ---------------------------------------------------------------------
+ The following 4 definitions are compiler-specific.
+ The C standard does not guarantee that wchar_t has at least
+ 16 bits, so wchar_t is no less portable than unsigned short!
+ All should be unsigned values to avoid sign extension during
+ bit mask & shift operations.
+------------------------------------------------------------------------ */
+
+typedef unsigned long UTF32; /* at least 32 bits */
+typedef unsigned short UTF16; /* at least 16 bits */
+typedef unsigned char UTF8; /* typically 8 bits */
+typedef unsigned char Boolean; /* 0 or 1 */
+
+/* Some fundamental constants */
+#define UNI_REPLACEMENT_CHAR (UTF32)0x0000FFFD
+#define UNI_MAX_BMP (UTF32)0x0000FFFF
+#define UNI_MAX_UTF16 (UTF32)0x0010FFFF
+#define UNI_MAX_UTF32 (UTF32)0x7FFFFFFF
+#define UNI_MAX_LEGAL_UTF32 (UTF32)0x0010FFFF
+
+typedef enum {
+ conversionOK, /* conversion successful */
+ sourceExhausted, /* partial character in source, but hit end */
+ targetExhausted, /* insuff. room in target for conversion */
+ sourceIllegal /* source sequence is illegal/malformed */
+} ConversionResult;
+
+typedef enum {
+ strictConversion = 0,
+ lenientConversion
+} ConversionFlags;
+
+/* This is for C++ and does no harm in C */
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+ConversionResult ConvertUTF8toUTF16 (
+ const UTF8** sourceStart, const UTF8* sourceEnd,
+ UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags);
+
+ConversionResult ConvertUTF16toUTF8 (
+ const UTF16** sourceStart, const UTF16* sourceEnd,
+ UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags);
+
+ConversionResult ConvertUTF8toUTF32 (
+ const UTF8** sourceStart, const UTF8* sourceEnd,
+ UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags);
+
+ConversionResult ConvertUTF32toUTF8 (
+ const UTF32** sourceStart, const UTF32* sourceEnd,
+ UTF8** targetStart, UTF8* targetEnd, ConversionFlags flags);
+
+ConversionResult ConvertUTF16toUTF32 (
+ const UTF16** sourceStart, const UTF16* sourceEnd,
+ UTF32** targetStart, UTF32* targetEnd, ConversionFlags flags);
+
+ConversionResult ConvertUTF32toUTF16 (
+ const UTF32** sourceStart, const UTF32* sourceEnd,
+ UTF16** targetStart, UTF16* targetEnd, ConversionFlags flags);
+
+Boolean isLegalUTF8Sequence(const UTF8 *source, const UTF8 *sourceEnd);
+
+#ifdef __cplusplus
+}
+#endif
+
+/* --------------------------------------------------------------------- */
Modified: tuxtype/trunk/tuxtype/Makefile.am
===================================================================
--- tuxtype/trunk/tuxtype/Makefile.am 2007-06-15 09:55:25 UTC (rev 186)
+++ tuxtype/trunk/tuxtype/Makefile.am 2007-06-17 02:12:57 UTC (rev 187)
@@ -16,7 +16,8 @@
snow.c \
scripting.c \
scripting.h \
- pause.c
+ pause.c \
+ ConvertUTF.c
SUBDIRS = \
data \
@@ -44,5 +45,8 @@
scripting.h \
snow.c \
snow.h \
- pause.c
+ pause.c \
+ ConvertUTF.c \
+ ConvertUTF.h
+
Modified: tuxtype/trunk/tuxtype/Makefile.in
===================================================================
--- tuxtype/trunk/tuxtype/Makefile.in 2007-06-15 09:55:25 UTC (rev 186)
+++ tuxtype/trunk/tuxtype/Makefile.in 2007-06-17 02:12:57 UTC (rev 187)
@@ -51,7 +51,8 @@
titlescreen.$(OBJEXT) loaders.$(OBJEXT) setup.$(OBJEXT) \
laser.$(OBJEXT) alphabet.$(OBJEXT) theme.$(OBJEXT) \
practice.$(OBJEXT) audio.$(OBJEXT) gettext.$(OBJEXT) \
- snow.$(OBJEXT) scripting.$(OBJEXT) pause.$(OBJEXT)
+ snow.$(OBJEXT) scripting.$(OBJEXT) pause.$(OBJEXT) \
+ ConvertUTF.$(OBJEXT)
tuxtype_OBJECTS = $(am_tuxtype_OBJECTS)
tuxtype_LDADD = $(LDADD)
DEFAULT_INCLUDES = -I. -I$(top_builddir)@am__isrc@
@@ -195,7 +196,8 @@
snow.c \
scripting.c \
scripting.h \
- pause.c
+ pause.c \
+ ConvertUTF.c
SUBDIRS = \
data \
@@ -223,7 +225,9 @@
scripting.h \
snow.c \
snow.h \
- pause.c
+ pause.c \
+ ConvertUTF.c \
+ ConvertUTF.h
all: all-recursive
@@ -291,6 +295,7 @@
distclean-compile:
-rm -f *.tab.c
+ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/ConvertUTF.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/alphabet.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/audio.Po at am__quote@
@AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gettext.Po at am__quote@
Modified: tuxtype/trunk/tuxtype/alphabet.c
===================================================================
--- tuxtype/trunk/tuxtype/alphabet.c 2007-06-15 09:55:25 UTC (rev 186)
+++ tuxtype/trunk/tuxtype/alphabet.c 2007-06-17 02:12:57 UTC (rev 187)
@@ -16,6 +16,9 @@
* *
***************************************************************************/
+/* Needed to convert UTF-8 under Windows because we don't have glibc: */
+#include "ConvertUTF.h"
+
#include "globals.h"
#include "funcs.h"
@@ -44,6 +47,7 @@
static void set_letters(unsigned char* t);
static void show_letters(void);
static void clear_keyboard(void);
+static int convert_from_UTF8(wchar_t* wide_word, const char* UTF8_word);
/*****************************************************/
/* */
@@ -450,6 +454,7 @@
while (!feof(wordFile) && (num_words < MAX_NUM_WORDS))
{
fscanf( wordFile, "%[^\n]\n", temp_word);
+ DEBUGCODE {fprintf(stderr, "temp_word = %s\n", temp_word);}
for (j = 0; j < strlen(temp_word); j++)
{
@@ -459,8 +464,9 @@
/* Convert from UTF-8 to wcs and make sure word is usable: */
/* NOTE need to add one to length arg so terminating '\0' gets added: */
- length = mbstowcs(temp_wide_word, temp_word, strlen(temp_word) + 1);
+ //length = mbstowcs(temp_wide_word, temp_word, strlen(temp_word) + 1);
+ length = convert_from_UTF8(temp_wide_word, temp_word);
DOUT(length);
if (length == -1) /* Means invalid UTF-8 sequence or conversion failed */
@@ -471,7 +477,7 @@
if (length == 0)
{
- fprintf(stderr, "Word '%s' not added - length is zero\n", temp_word);
+ fprintf(stderr, "Word '%ls' not added - length is zero\n", temp_wide_word);
continue;
}
@@ -781,3 +787,47 @@
KEYMAP[i]=i;
}
}
+/* This function just tidies up all the ptr args needed for */
+/* ConvertUTF8toUTF32() from Unicode, Inc. into a neat wrapper. */
+/* It returns -1 on error, otherwise returns the length of the */
+/* converted, null-terminated wchar_t* string now stored in the */
+/* location of the 'wide_word' pointer. */
+static int convert_from_UTF8(wchar_t* wide_word, const char* UTF8_word)
+{
+ int i = 0;
+ ConversionResult result;
+ UTF8 temp_UTF8[FNLEN];
+ UTF32 temp_UTF32[FNLEN];
+
+ const UTF8* UTF8_Start = temp_UTF8;
+ const UTF8* UTF8_End = &temp_UTF8[FNLEN-1];
+ UTF32* UTF32_Start = temp_UTF32;
+ UTF32* UTF32_End = &temp_UTF32[FNLEN-1];
+
+ strncpy(temp_UTF8, UTF8_word, FNLEN);
+
+ ConvertUTF8toUTF32(&UTF8_Start, UTF8_End,
+ &UTF32_Start, UTF32_End, 0);
+
+ wide_word[0] = '\0';
+
+ while ((i < FNLEN) && (temp_UTF32[i] != '\0'))
+ {
+ wide_word[i] = temp_UTF32[i];
+ i++;
+ }
+
+ if (i >= FNLEN)
+ {
+ fprintf(stderr, "convert_from_UTF8(): buffer overflow\n");
+ return -1;
+ }
+ else //need terminating null:
+ {
+ wide_word[i] = '\0';
+ }
+
+ DEBUGCODE {fprintf(stderr, "wide_word = %ls\n", wide_word);}
+
+ return wcslen(wide_word);
+}
Modified: tuxtype/trunk/tuxtype/data/themes/jamaican/words/jam-long.txt
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/jamaican/words/jam-long.txt 2007-06-15 09:55:25 UTC (rev 186)
+++ tuxtype/trunk/tuxtype/data/themes/jamaican/words/jam-long.txt 2007-06-17 02:12:57 UTC (rev 187)
@@ -1,22 +1,22 @@
Jamaican Long Words
-coconut
-netball
-football
-cricket
-Jamaica
-saltfish
-callaloo
-maroon
-mountain
-dancehall
-chicken
-porridge
-bamboo
-soupsop
-orange
-banana
-Kingston
-calabash
-cassava
-jackfruit
-festival
\ No newline at end of file
+COCONUT
+NETBALL
+FOOTBALL
+CRICKET
+JAMAICA
+SALTFISH
+CALLALOO
+MAROON
+MOUNTAIN
+DANCEHALL
+CHICKEN
+PORRIDGE
+BAMBOO
+SOUPSOP
+ORANGE
+BANANA
+KINGSTON
+CALABASH
+CASSAVA
+JACKFRUIT
+FESTIVAL
\ No newline at end of file
Modified: tuxtype/trunk/tuxtype/data/themes/jamaican/words/jam-med.txt
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/jamaican/words/jam-med.txt 2007-06-15 09:55:25 UTC (rev 186)
+++ tuxtype/trunk/tuxtype/data/themes/jamaican/words/jam-med.txt 2007-06-17 02:12:57 UTC (rev 187)
@@ -1,30 +1,30 @@
Jamaican Medium Words
-ackee
-beach
-mango
-Nanny
-coffee
-orange
-arawak
-reggae
-guava
-ocean
-church
-donkey
-patois
-obeah
-bammy
-bongo
-mento
-parish
-coral
-market
-papaya
-negril
-guinep
-chocho
-ginger
-sorrel
-wicket
-bowler
-chain
\ No newline at end of file
+ACKEE
+BEACH
+MANGO
+NANNY
+COFFEE
+ORANGE
+ARAWAK
+REGGAE
+GUAVA
+OCEAN
+CHURCH
+DONKEY
+PATOIS
+OBEAH
+BAMMY
+BONGO
+MENTO
+PARISH
+CORAL
+MARKET
+PAPAYA
+NEGRIL
+GUINEP
+CHOCHO
+GINGER
+SORREL
+WICKET
+BOWLER
+CHAIN
\ No newline at end of file
Modified: tuxtype/trunk/tuxtype/data/themes/jamaican/words/jam-short.txt
===================================================================
--- tuxtype/trunk/tuxtype/data/themes/jamaican/words/jam-short.txt 2007-06-15 09:55:25 UTC (rev 186)
+++ tuxtype/trunk/tuxtype/data/themes/jamaican/words/jam-short.txt 2007-06-17 02:12:57 UTC (rev 187)
@@ -1,26 +1,26 @@
Jamaican Short Words
-bus
-tea
-rum
-sun
-yam
-sand
-goat
-dog
-rice
-drum
-peas
-jerk
-pine
-cane
-taxi
-plum
-pear
-sea
-palm
-cart
-zinc
-ital
-yard
-cay
-soca
\ No newline at end of file
+BUS
+TEA
+RUM
+SUN
+YAM
+SAND
+GOAT
+DOG
+RICE
+DRUM
+PEAS
+JERK
+PINE
+CANE
+TAXI
+PLUM
+PEAR
+SEA
+PALM
+CART
+ZINC
+ITAL
+YARD
+CAY
+SOCA
\ No newline at end of file
Modified: tuxtype/trunk/tuxtype/docs/en/howtotheme.html
===================================================================
--- tuxtype/trunk/tuxtype/docs/en/howtotheme.html 2007-06-15 09:55:25 UTC (rev 186)
+++ tuxtype/trunk/tuxtype/docs/en/howtotheme.html 2007-06-17 02:12:57 UTC (rev 187)
@@ -6,14 +6,14 @@
</head>
<body bgcolor="#ffffff">
<h2>Theming in Tuxtyping 1.5.1</h2>
-<p>A "Theme" is a method to change the data which Tuxtyping uses. While this could be used to change the game about Tux and fish, to a game about a Cat and mice, more likely you are interested in making Tuxtyping work in another language. (if you are intersted in creating a new graphical theme like "Racecars" or ... that is cool too, but if things don't act right, please <a href="http://tux4kids.net/mailman/listinfo/tuxtype-dev">contact us</a>).
+<p>A "Theme" is a method to change the data which Tuxtyping uses. While this could be used to change the game about Tux and fish, to a game about a Cat and mice, more likely you are interested in making Tuxtyping work in another language. (if you are intersted in creating a new graphical theme like "Racecars" or ... that is cool too, but if things don't act right, please <a href="http://tux4kids.alioth.debian.org">contact us</a>).
<p>I will walk through how I created the "French" theme in boxes in this text.
<h3>Difference to Tuxtyping 1.0</h3>
<p>In Tuxtyping 1.0, to create a theme, you needed to recreate every image file that was used by the game. This means you had to include every image even if you didn't change it. Plus all the text in the game were actually pre-created graphics, and the game could only use A-Z.
<p>In Tuxtyping 1.5, you can can include changes to the image files, but if you don't include one, we will just use the default image included with the default theme (English). Also instead of all the text in the game being pre-created, it is all rendered, so you can change the font and/or the text very easily. Plus, you can change it so you include numbers, or anything else you can type!
<center><table bgcolor="#ffcccc" width="80%" border=1 cellspacing=2><tr><td>
-<b>Changes since <a href="howtotheme-1.5.0.html">1.5.0 Theming Howto</a>:</b>
+<b>Changes since 1.5.0 Theming Howto</a>:</b>
<ul><li>Keyboard.lst format changed to eliminate redundant information
<li>themes.txt is no longer used... we create the list dynamically
<li>words.lst is no longer used.. we create the list dynamically
@@ -27,7 +27,7 @@
<ol>
<li>Creating the directory and adding it to menu system
-<p>Themes are located in the data directory of Tuxtyping 2. This will be different depending on which operating system you are using. If you have trouble finding where the data directory is for your system, contact <a href="mailto:tuxtype-dev at tux4kids.net">us</a>. I will refer to this directory containing themes as <b>data/themes/</b>
+<p>Themes are located in the data directory of Tuxtyping 2. This will be different depending on which operating system you are using. If you have trouble finding where the data directory is for your system, contact <a href="mailto:tuxmath-devel at lists.sourceforge.net">us</a>. I will refer to this directory containing themes as <b>data/themes/</b>
<p>Each theme has its own directory in the <b>data/themes/</b> directory. For instance if you are creating a French theme, you would create a directory called <b>french</b> in the themes directory, so you have <b>data/themes/french</b>. All of the data for your theme will be located in this directory.
<p>Now if you go into the game, you should see a new entry in the "Setup Languages" menu for your theme.
<center><table bgcolor="#ccccff" width="75%" border=1 cellpadding=4><tr><td>
@@ -141,10 +141,10 @@
<p><b>Q:</b> Why do I need both menu.ttf and letters.ttf?
<p><b>A:</b> There are times when you may need a different font for the menus and for the text that the player will have to type. For instance if you create an American Sign Language (ASL) theme, you will probably want the letters font to be a truetype font that has the hands/fingers in the proper positions.
<hr>
-<center><a href="http://tuxtype.sf.net">TuxTyping Homepage</a>
-<a href="http://tuxtype.sf.net/forums/">TuxTyping Forums</a>
-<a href="mailto:jdandr2 at uky.edu">jdandr2 at uky.edu</a>
+<center><a href="http://tux4kids.alioth.debian.org">TuxTyping Homepage</a>
+<a href="http://alioth.debian.org/forum/?group_id=31080">TuxTyping Forums</a>
+<a href="mailto:dbruce at tampabay.rr.com">dbruce at tampabay.rr.com</a>
<br><br>
-<font size="-2">Last edited May 16, 2003</font>
+<font size="-2">Last edited June 16, 2007 but by no means fully up-to-date!</font>
</center>
</body>
Modified: tuxtype/trunk/tuxtype/main.c
===================================================================
--- tuxtype/trunk/tuxtype/main.c 2007-06-15 09:55:25 UTC (rev 186)
+++ tuxtype/trunk/tuxtype/main.c 2007-06-17 02:12:57 UTC (rev 187)
@@ -42,7 +42,7 @@
speed_up = 0; //run at normal speed
show_tux4kids = 1; //show tux4kids logo the first time in main menu
useEnglish = 1; //default to no theme
- debugOn = 1; //default to not in debug mode
+ debugOn = 0; //default to not in debug mode
hidden = 0; //default to no "hidden" background
More information about the Tux4kids-commits
mailing list