Update to Liblouis 3.21.0

liblouis · Mar 28, 2022 · 3603382 · 3603382
1 parent 338a3a2
commit 3603382
Show file tree

Hide file tree

Showing 5 changed files with 60 additions and 33 deletions.
diff --git a/pom.xml b/pom.xml
@@ -38,7 +38,7 @@
       <dependency>
         <groupId>org.liblouis</groupId>
         <artifactId>louis</artifactId>
-        <version>3.19.0</version>
+        <version>3.21.0-p1</version>
         <type>nar</type>
       </dependency>
     </dependencies>

diff --git a/src/test/java/org/liblouis/DefaultTablesTest.java b/src/test/java/org/liblouis/DefaultTablesTest.java
@@ -17,11 +17,11 @@ public void testTranslateDutch() throws Exception {
 	}
 
 	@Test
-	public void testCountAvailableLocales() {
+	public void testCountAvailableLanguages() {
 		Set<String> locales = new HashSet<String>();
 		for (Table t : Louis.listTables())
-			locales.add(t.getInfo().get("locale"));
-		assertEquals(104, locales.size());
+			locales.add(t.getInfo().get("language"));
+		assertEquals(99, locales.size());
 	}
 
 	@Test
@@ -31,6 +31,6 @@ public void testCompileAllTables() throws CompilationException {
 			t.getTranslator();
 			count++;
 		}
-		assertEquals(181, count);
+		assertEquals(182, count);
 	}
 }
diff --git a/src/test/java/org/liblouis/FindTableTest.java b/src/test/java/org/liblouis/FindTableTest.java
@@ -37,7 +37,7 @@ public void testMatchFound() throws Exception {
 	public void testListAvailableLocales() {
 		List<String> locales = new ArrayList<String>();
 		for (Table t : Louis.listTables())
-			locales.add(t.getInfo().get("locale"));
+			locales.add(t.getInfo().get("language"));
 		assertEquals(1, locales.size());
 		assertEquals("foo", locales.get(0));
 	}

diff --git a/src/test/java/org/liblouis/TranslatorTest.java b/src/test/java/org/liblouis/TranslatorTest.java
@@ -16,7 +16,7 @@ public class TranslatorTest {
 	@Test
 	public void testVersion() {
 		assertEquals(
-			"3.19.0",
+			"3.21.0-p1",
 			Louis.getVersion());
 	}
 

diff --git a/src/test/resources/tables/foobar.cti b/src/test/resources/tables/foobar.cti
@@ -1,29 +1,56 @@
-uplow Aa 18,1
-uplow Bb 128,12
-uplow Cc 148,14
-uplow Dd 1458,145
-uplow Ee 158,15
-uplow Ff 1248,124
-uplow Gg 12458,1245
-uplow Hh 1258,125
-uplow Ii 248,24
-uplow Jj 2458,245
-uplow Kk 138,13
-uplow Ll 1238,123
-uplow Mm 1348,134
-uplow Nn 13458,1345
-uplow Oo 1358,135
-uplow Pp 12348,1234
-uplow Qq 123458,12345
-uplow Rr 12358,1235
-uplow Ss 2348,234
-uplow Tt 23458,2345
-uplow Uu 1368,136
-uplow Vv 12368,1236
-uplow Ww 24568,2456
-uplow Xx 13468,1346
-uplow Yy 134568,13456
-uplow Zz 13568,1356
+lowercase a 1
+lowercase b 12
+lowercase c 14
+lowercase d 145
+lowercase e 15
+lowercase f 124
+lowercase g 1245
+lowercase h 125
+lowercase i 24
+lowercase j 245
+lowercase k 13
+lowercase l 123
+lowercase m 134
+lowercase n 1345
+lowercase o 135
+lowercase p 1234
+lowercase q 12345
+lowercase r 1235
+lowercase s 234
+lowercase t 2345
+lowercase u 136
+lowercase v 1236
+lowercase w 2456
+lowercase x 1346
+lowercase y 13456
+lowercase z 1356
+
+uppercase A 18
+uppercase B 128
+uppercase C 148
+uppercase D 1458
+uppercase E 158
+uppercase F 1248
+uppercase G 12458
+uppercase H 1258
+uppercase I 248
+uppercase J 2458
+uppercase K 138
+uppercase L 1238
+uppercase M 1348
+uppercase N 13458
+uppercase O 1358
+uppercase P 12348
+uppercase Q 123458
+uppercase R 12358
+uppercase S 2348
+uppercase T 23458
+uppercase U 1368
+uppercase V 12368
+uppercase W 24568
+uppercase X 13468
+uppercase Y 134568
+uppercase Z 13568
 
 digit 0 245
 digit 1 1