Revision: 582 Author: mesar.hameed Date: Thu Apr 26 07:42:07 2012 Log: Started on table instruction deduplication: Added latinLetterDef6Dots.uti and latinLetterDef8Dots.uti http://code.google.com/p/liblouis/source/detail?r=582 Added: /trunk/tables/latinLetterDef6Dots.uti /trunk/tables/latinLetterDef8Dots.uti Modified: /trunk/NEWS /trunk/tables/Makefile.am /trunk/tables/ar-ar-g1.utb ======================================= --- /dev/null +++ /trunk/tables/latinLetterDef6Dots.uti Thu Apr 26 07:42:07 2012 @@ -0,0 +1,31 @@+# Latin letters a-z where capitals are defined as equivalent to the lowercase.
+# This table is usually used by 6 dot tables. To distinguish between +# capitals and lowercase, the language table should make use of the +# capsign and begcaps opcodes. + +uplow Aa 1 +uplow Bb 12 +uplow Cc 14 +uplow Dd 145 +uplow Ee 15 +uplow Ff 124 +uplow Gg 1245 +uplow Hh 125 +uplow Ii 24 +uplow Jj 245 +uplow Kk 13 +uplow Ll 123 +uplow Mm 134 +uplow Nn 1345 +uplow Oo 135 +uplow Pp 1234 +uplow Qq 12345 +uplow Rr 1235 +uplow Ss 234 +uplow Tt 2345 +uplow Uu 136 +uplow Vv 1236 +uplow Ww 2456 +uplow Xx 1346 +uplow Yy 13456 +uplow Zz 1356 ======================================= --- /dev/null +++ /trunk/tables/latinLetterDef8Dots.uti Thu Apr 26 07:42:07 2012 @@ -0,0 +1,29 @@ +# Latin letters a-z with dot 7 as capital indicator. +# Usually included to form a 8 dots table. + +uplow Aa 17,1 +uplow Bb 127,12 +uplow Cc 147,14 +uplow Dd 1457,145 +uplow Ee 157,15 +uplow Ff 1247,124 +uplow Gg 12457,1245 +uplow Hh 1257,125 +uplow Ii 247,24 +uplow Jj 2457,245 +uplow Kk 137,13 +uplow Ll 1237,123 +uplow Mm 1347,134 +uplow Nn 13457,1345 +uplow Oo 1357,135 +uplow Pp 12347,1234 +uplow Qq 123457,12345 +uplow Rr 12357,1235 +uplow Ss 2347,234 +uplow Tt 23457,2345 +uplow Uu 1367,136 +uplow Vv 12367,1236 +uplow Ww 24567,2456 +uplow Xx 13467,1346 +uplow Yy 134567,13456 +uplow Zz 13567,1356 ======================================= --- /trunk/NEWS Tue Apr 17 01:27:13 2012 +++ /trunk/NEWS Thu Apr 26 07:42:07 2012 @@ -23,6 +23,10 @@ characters ** Braille Table Improvements+ - Added latinLetterDef6Dots.uti and latinLetterDef8Dots.uti, to better make use of table include infrastructure. + This removes duplication in tables, and should make it easier to define tables, since instead of defining individual + characters, the table producer can simply include the right class of definitions.
+ - ar-ar-g1.utb make use of the latinLetterDef6Dots.uti. * Noteworthy changes in release 2.4.1 (2012-2-22) ======================================= --- /trunk/tables/Makefile.am Fri Apr 20 06:09:23 2012 +++ /trunk/tables/Makefile.am Thu Apr 26 07:42:07 2012 @@ -130,6 +130,8 @@ kok.ctb \ kru.ctb \ lang2table \ + latinLetterDef6Dots.uti \ + latinLetterDef8Dots.uti \ letterDefTest.ctb \ lt.ctb \ Lv-Lv-g1.utb \ ======================================= --- /trunk/tables/ar-ar-g1.utb Mon Jan 9 03:12:09 2012 +++ /trunk/tables/ar-ar-g1.utb Thu Apr 26 07:42:07 2012 @@ -65,39 +65,15 @@ math > 0-135-0 # 62 punctuation ? 1456 # 63 sign @ 4 # 64 -uplow Aa 1 # 65 -uplow Bb 12 -uplow Cc 14 -uplow Dd 145 -uplow Ee 15 -uplow Ff 124 -uplow Gg 1245 -uplow Hh 125 -uplow Ii 24 -uplow Jj 245 -uplow Kk 13 -uplow Ll 123 -uplow Mm 134 -uplow Nn 1345 -uplow Oo 135 -uplow Pp 1234 -uplow Qq 12345 -uplow Rr 1235 -uplow Ss 234 -uplow Tt 2345 -uplow Uu 136 -uplow Vv 1236 -uplow Ww 2456 -uplow Xx 1346 -uplow Yy 13456 -uplow Zz 1356 # 90 / 122 + +include latinLetterDef6Dots.uti + punctuation [ 6-236 # 91 sign \\ 6-34 # 92 punctuation ] 356-6 # 93 sign ^ 346 # 94 circumflex accent sign _ 456 # 95 underscore sign ` 4 # 96 grave accent -# a - z # 97 - 122 punctuation { 5-236 # 123 sign | 1245 # 124 punctuation } 356-2 # 125 For a description of the software, to download it and links to project pages go to http://www.abilitiessoft.com