Merge pull request #20 from marytts/v2

V2
marytts · Nov 8, 2024 · 28c9d82 · 28c9d82
2 parents 9ba102f + b4a5baf
commit 28c9d82
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,18 @@ Lower Sorbian language component for MaryTTS
 [Unreleased]
 ------------
 
+### Added
+
+- More abbreviations
+
+### Fixed
+
+- Number expansion for years 1100-1999
+
+### Changed
+
+- Upgraded lexicon to v0.2.1
+
 [v0.2.0] - 2024-10-02
 ---------------------
 

diff --git a/build.gradle b/build.gradle
@@ -21,13 +21,9 @@ marytts {
     }
 }
 
-repositories {
-    mavenCentral()
-}
-
 dependencies {
     implementation group: 'org.apache.commons', name: 'commons-csv', version: '1.9.0'
-    runtimeOnly group: 'de.dfki.mary', name: 'marytts-lexicon-dsb', version: '0.2.0'
+    runtimeOnly group: 'de.dfki.mary', name: 'marytts-lexicon-dsb', version: '0.2.1'
 }
 
 java {

diff --git a/src/main/resources/marytts/language/dsb/abbreviations.csv b/src/main/resources/marytts/language/dsb/abbreviations.csv
@@ -1,4 +1,15 @@
 "abbreviation","expansion"
+"A0","a nula"
+"A1","a jaden"
+"A2","a dwa"
+"A3","a tśi"
+"A4","a styri"
+"A5","a pěś"
+"A6","a šesć"
+"A7","a sedym"
+"1989/90","źewjeśnasćostow źewjeśawósymźaset źewjeśźaset"
+"ca.","circa"
+"dr.","doktor"
 "kwart.","kwartal"
 "kw.","kwartal"
 "mjas.","mjasac"

diff --git a/src/main/resources/marytts/language/dsb/formatRules.txt b/src/main/resources/marytts/language/dsb/formatRules.txt
@@ -35,6 +35,7 @@ x.x: << koma >>;
 400: styrista[>>];
 500: <<stow[>>];
 1000: tysac[>>];
+1100/100: <%spellout-numbering<stow[ >>];
 2000: <<tysac[>>];
 1000000: jaden milion[ >>];
 2000000: dwa miliona[ >>];
@@ -211,13 +212,3 @@ x.x: << koma >>;
 9000: źewjeśtysacne;
 10000: źaseśtysacne;
 20000: dwaźasćatysacne;
-%alt-teens:
-=%spellout-numbering=;
-1000>: <%%alt-hundreds<[ >>];
-10000: =%spellout-numbering=;
-%%alt-hundreds:
-0: SHOULD NEVER GET HERE!;
-10: <%spellout-numbering< tysac;
-11: =%spellout-numbering= stow>%%empty>;
-%%empty:
-0:;
diff --git a/src/test/resources/marytts/language/dsb/numbers.csv b/src/test/resources/marytts/language/dsb/numbers.csv
@@ -18,8 +18,11 @@
 665,šesćstowpěśašesćźaset
 -827,minus wósymstowsedymadwaźasća
 1033,tysactśiatśiźasća
-1500,tysacpěśstow
-1984,tysacźewjeśstowstyriawósymźaset
+1217,dwanasćostow sedymnasćo
+1500,pěśnasćostow
+1601,šesnasćostow jaden
+1854,wósymnasćostow styriapołsta
+1984,źewjeśnasćostow styriawósymźaset
 5022,pěśtysacdwaadwaźasća
 10101,źaseśtysacstojaden
 42099,dwaastyrźasćatysacźewjeśaźewjeśźaset