Revision: 761 Author: john.boyer@xxxxxxxxxxxxxxxxx Date: Mon Aug 13 06:25:07 2012 Log: fixed handling of emphasis in lou_allround http://code.google.com/p/liblouis/source/detail?r=761 Modified: /trunk/tables/en-us-g2.ctb /trunk/tools/lou_allround.c ======================================= --- /trunk/tables/en-us-g2.ctb Tue Aug 7 06:52:10 2012 +++ /trunk/tables/en-us-g2.ctb Mon Aug 13 06:25:07 2012 @@ -57,6 +57,7 @@ always aer = Rosenlaer begword aforem 1-123456-15-134 aforementioned word aforesaid 1-123456-15-234-145 +always afr 1-124-1235 sufword after 1-124 contraction af always afternoon 1-124-1345 afternoons @@ -557,7 +558,7 @@ word o'clock 135-3-14 # the letter p -word paid 1234-145 +prfword paid 1234-145 contraction pd always part 5-1234 begword parta 1234-345-2345-1 partake ======================================= --- /trunk/tools/lou_allround.c Fri May 11 08:17:52 2012 +++ /trunk/tools/lou_allround.c Mon Aug 13 06:25:07 2012 @@ -198,13 +198,13 @@ printf ("(Enter an x to cancel emphasis.)\n"); printf ("Enter an emphasis string: "); getInput (); - strcpy (emphasis, inputBuffer); + strcpy (enteredEmphasis, inputBuffer); break; case 's': printf ("(Enter an x to cancel spacing.)\n"); printf ("Enter a spacing string: "); getInput (); - strcpy (spacing, inputBuffer); + strcpy (enteredSpacing, inputBuffer); break; case 'h': printf ("Commands: action\n"); @@ -402,8 +402,6 @@ } if (cursorPos != -1) printf ("Cursor position: %d\n", cursorPos); - if (enteredEmphasis[0]) - printf ("Returned emphasis: %s\n", emphasis); if (enteredSpacing[0]) printf ("Returned spacing: %s\n", spacing); if (showPositions) @@ -434,8 +432,6 @@ translen, outlen); if (cursorPos != -1) printf ("Cursor position: %d\n", cursorPos); - if (enteredEmphasis[0]) - printf ("Returned emphasis: %s\n", emphasis); if (enteredSpacing[0]) printf ("Returned spacing: %s\n", spacing); if (showPositions) For a description of the software, to download it and links to project pages go to http://www.abilitiessoft.com