Author: john.boyer@xxxxxxxxxxxxxxxx Date: Thu Jan 15 06:32:20 2009 New Revision: 66 Modified: trunk/ChangeLog trunk/configure.ac trunk/liblouis/compileTranslationTable.c trunk/liblouis/lou_translateString.c trunk/tools/lou_debug.c Log: Moved to version 5.1.1, bugfix: lou_translateString.c, lou_debug.c, compileTranslationTable.e. See ChangeLog. Modified: trunk/ChangeLog ============================================================================== --- trunk/ChangeLog (original) +++ trunk/ChangeLog Thu Jan 15 06:32:20 2009 @@ -1,3 +1,11 @@ +2009-01-15 John J. Boyer <john.boyer/jjb-software.com> + + * Version 1.5.1: bugfix + * liblouis/lou_translateString.c: fixed multi-word phrases + * tools/lou_debug.c : fixed bug in character display + * liblouis/compileTranslationTable.c : fixed bug in + findOpcodeName + 2009-01-14 James Teh <jamie@xxxxxxxxxxx>* liblouis/lou_translateString.c: Fix the inpos array values for the case where a rule has an output length which is larger than its input length. For example, using UEBC, given the input "#", the output will be "_?". The array mapping from output to input (inpos) previously specified [0, 1], which is incorrect; there is no character at index 1 in the input. The correct result is now returned; i.e. [0, 0].
Modified: trunk/configure.ac ============================================================================== --- trunk/configure.ac (original) +++ trunk/configure.ac Thu Jan 15 06:32:20 2009 @@ -1,7 +1,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT(liblouis, 1.5.0, john.boyer@xxxxxxxxxxxxxxxx) +AC_INIT(liblouis, 1.5.1, john.boyer@xxxxxxxxxxxxxxxx) AC_CONFIG_SRCDIR([liblouis/lou_backTranslateString.c]) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) AM_CONFIG_HEADER(liblouis/louiscfg.h) @@ -45,7 +45,7 @@ # increment any time the source changes; set to # 0 if you increment CURRENT -LIBLOUIS_REVISION=0 +LIBLOUIS_REVISION=1 # increment if any interfaces have been added; set to 0 # if any interfaces have been changed or removed. removal has Modified: trunk/liblouis/compileTranslationTable.c ============================================================================== --- trunk/liblouis/compileTranslationTable.c (original) +++ trunk/liblouis/compileTranslationTable.c Thu Jan 15 06:32:20 2009 @@ -1255,7 +1255,10 @@ { /* Used by tools such as lou_debug */ if (opcode < 0 || opcode >= CTO_None) - return NULL; + { + sprintf (scratchBuf, "%d", opcode); + return scratchBuf; + } return opcodeNames[opcode]; } @@ -3386,12 +3389,12 @@ if (swapNames) deallocateSwapNames (); if (!errorCount) -{ - setDefaults (); - table->tableSize = tableSize; - table->bytesUsed = tableUsed; -} -else + { + setDefaults (); + table->tableSize = tableSize; + table->bytesUsed = tableUsed; + } + else { lou_logPrint ("%d errors found.", errorCount); if (table) Modified: trunk/liblouis/lou_translateString.c ============================================================================== --- trunk/liblouis/lou_translateString.c (original) +++ trunk/liblouis/lou_translateString.c Thu Jan 15 06:32:20 2009 @@ -645,7 +645,9 @@ ruleChar = for_findCharOrDots (transRule->charsdots[kk++], 0); if ((currentInputChar->lowercase != ruleChar->lowercase) || (typebuf != NULL && (typebuf[k] & mask) != (typebuf[src] & mask)) - || (k != (src + 1) && ((currentInputChar->attributes & + || (k != (src + 1) && (prevAttr & +CTC_Letter) && (currentInputChar->attributes & CTC_Letter) && +((currentInputChar->attributes & (CTC_LowerCase | CTC_UpperCase)) != (prevAttr & Modified: trunk/tools/lou_debug.c ============================================================================== --- trunk/tools/lou_debug.c (original) +++ trunk/tools/lou_debug.c Thu Jan 15 06:32:20 2009 @@ -129,9 +129,7 @@ while (nextRule) { thisRule = (TranslationTableRule *) & table->ruleArea[nextRule]; - if ((mode == 0 && thisRule->charsnext == 0) || (mode == 1 && - thisRule->dotsnext == - 0)) + if (nextRule == thisChar->definitionRule) printf ("definition "); printRule (thisRule, mode); printf ("\n"); For a description of the software and to download it go to http://www.jjb-software.com