Merge pull request #26 from marytts/v2

V2
marytts · Nov 8, 2024 · 53046bc · 53046bc
2 parents ba27de3 + 51c3f15
commit 53046bc
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,10 @@ Upper Sorbian language component for MaryTTS
 
 - Abbreviation expansion in preprocessing
 
+### Fixed
+
+- Number expansion for years 1100-1999
+
 [v0.2.0] - 2024-05-12
 ---------------------
 

diff --git a/src/main/resources/marytts/language/hsb/abbreviations.csv b/src/main/resources/marytts/language/hsb/abbreviations.csv
@@ -1,3 +1,15 @@
+"abbreviation","expansion"
+"A0","a nula"
+"A1","a jedyn"
+"A2","a dwaj"
+"A3","a tři"
+"A4","a štyri"
+"A5","a pjeć"
+"A6","a šěsć"
+"A7","a sydom"
+"1989/90","dźewjatnaćestow dźewjećawosomdźesat dźewjećdźesat"
+"ca.","circa"
+"dr.","doktor"
 "kwart.","kwartal"
 "kw.","kwartal"
 "měs.","měsac"

diff --git a/src/main/resources/marytts/language/hsb/formatRules.txt b/src/main/resources/marytts/language/hsb/formatRules.txt
@@ -35,6 +35,7 @@ x.x: << koma >>;
 400: štyrista[>>];
 500: <<stow[>>];
 1000: tysac[>>];
+1100/100: <%spellout-numbering<stow[ >>];
 2000: <<tysac[>>];
 1000000: jedyn milion[ >>];
 2000000: dwaj milionaj[ >>];
@@ -173,13 +174,3 @@ x.x: << koma >>;
 80: [>>a]wosomdźesate;
 90: [>>a]dźewjećdźesate;
 100: stote;
-%alt-teens:
-=%spellout-numbering=;
-1000>: <%%alt-hundreds<[ >>];
-2000: =%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/hsb/numbers.csv b/src/test/resources/marytts/language/hsb/numbers.csv
@@ -17,8 +17,11 @@
 665,šěsćstowpjećašěsćdźesat
 827,wosomstowsydomadwaceći
 1033,tysactřiatřiceći
-1500,tysacpjećstow
-1984,tysacdźewjećstowštyriawosomdźesat
+1217,dwanaćestow sydomnaće
+1500,pjatnaćestow
+1601,šěsnaćestow jedyn
+1854,wosomnaćestow štyriapołsta
+1984,dźewjatnaćestow štyriawosomdźesat
 5022,pjećtysacdwajadwaceći
 10101,dźesaćtysacstojedyn
 42099,dwajaštyrcećitysacdźewjećadźewjećdźesat
@@ -31,4 +34,4 @@
 375730163855,"třistapjećasydomdźesat miliardow sydomstowtřiceći milionow stotřiašěsćdźesattysacwosomstowpjećapołsta"
 2455353628018,"dwaj bilionaj štyristapjećapołsta miliardow třistatřiapołsta milionow šěsćstowwosomadwacećitysacwosomnaće"
 1001001001001001,"jedna biliarda jedyn bilion jedna miliarda jedyn milion tysacjedyn"
-3.14159,"tři koma jedyn štyri jedyn pjeć dźewjeć"
+3.14159,"tři koma jedyn štyri jedyn pjeć dźewjeć"