Revision: 621 Author: bertfrees@xxxxxxxxx Date: Tue May 15 04:46:27 2012 Log: Added a test for this, and updated NEWS file http://code.google.com/p/liblouis/source/detail?r=621 Added: /trunk/tests/inpos_match_replace.c /trunk/tests/tables/inpos_match_replace.ctb Modified: /trunk/NEWS /trunk/tests/Makefile.am /trunk/tests/tables/inpos_pass3.ctb ======================================= --- /dev/null +++ /trunk/tests/inpos_match_replace.c Tue May 15 04:46:27 2012 @@ -0,0 +1,25 @@ +#include <stdio.h> +#include <string.h> +#include <stdlib.h> +#include "brl_checks.h" + +int +main(int argc, char **argv) +{ + + int result = 0; + + const char* txt = "Fussball-Vereinigung"; + + const char* table = "inpos_match_replace.ctb"; + + const char* brl = "FUSSBALL-V7EINIGUNG"; + + const int inpos[] = {0,1,2,3,4,5,6,7,8,9,9,12,13,14,15,16,17,18,19}; + + result |= check_translation(table, txt, NULL, brl); + result |= check_inpos(table, txt, inpos); + + return result; + +} ======================================= --- /dev/null +++ /trunk/tests/tables/inpos_match_replace.ctb Tue May 15 04:46:27 2012 @@ -0,0 +1,37 @@ +display A 1 +display B 12 +display E 15 +display F 124 +display G 1245 +display I 24 +display L 123 +display N 1345 +display R 1235 +display S 234 +display U 136 +display V 1236 +display 7 12456 +display - 36 +display - 36a + +uplow \x0041\x0061 1 Aa +uplow \x0042\x0062 12 Bb +uplow \x0045\x0065 15 Ee +uplow \x0046\x0066 124 Ff +uplow \x0047\x0067 1245 Gg +uplow \x0049\x0069 24 Ii +uplow \x004C\x006C 123 Ll +uplow \x004E\x006E 1345 Nn +uplow \x0052\x0072 1235 Rr +uplow \x0053\x0073 234 Ss +uplow \x0055\x0075 136 Uu +uplow \x0056\x0076 1236 Vv +digit \x0037 12456 7 +punctuation \x002D 36 - +math \x2212 36a - + +begword ver 36a + +pass2 @36[@36a] @1236-12456 + + ======================================= --- /trunk/NEWS Fri May 11 05:41:02 2012 +++ /trunk/NEWS Tue May 15 04:46:27 2012 @@ -23,6 +23,7 @@ - lou_allround and lou_translate now properly handle unicode characters - Fix some issues reported by Valgrind+ - Fix inputPos for situation where context and multipass opcodes are involved
** Braille Table Improvements - Added: ======================================= --- /trunk/tests/Makefile.am Mon May 14 05:22:01 2012 +++ /trunk/tests/Makefile.am Tue May 15 04:46:27 2012 @@ -49,6 +49,11 @@ brl_checks.h \ inpos.c +inpos_match_replace_SOURCES = \ + brl_checks.c \ + brl_checks.h \ + inpos_match_replace.c + letterDefTest_SOURCES = \ brl_checks.c \ brl_checks.h \ @@ -63,6 +68,7 @@ pass2 \ pass2_inpos \ inpos \ + inpos_match_replace \ uplow_with_unicode \ present_progressive \ capitalized_word \ ======================================= --- /trunk/tests/tables/inpos_pass3.ctb Mon May 14 05:22:01 2012 +++ /trunk/tests/tables/inpos_pass3.ctb Tue May 15 04:46:27 2012 @@ -1,3 +1,1 @@ pass3 [@13] @5-5-5 -#pass3 @4[@13] @5-5-5 # This is still a bug - For a description of the software, to download it and links to project pages go to http://www.abilitiessoft.com