Index: languages/apertium-srd/apertium-srd.srd.dix
===================================================================
--- languages/apertium-srd/apertium-srd.srd.dix (revision 70097)
+++ languages/apertium-srd/apertium-srd.srd.dix (revision 70101)
@@ -6275,6 +6275,7 @@
ZaponeGiappone
JiaponiGiappone
+ Islanda
Ispagna
SpànniaIspagna
IspannaIspagna
@@ -6284,7 +6285,7 @@
GermaniaGermània
ZermàniaGermània
Cuba
- Canada
+ Canada
CànadaCanada
Austria
ÀustriaAustria
@@ -6389,7 +6390,6 @@
Turri
ÙssaraManna
Biddexidru
- BiddaMara
BiddanoaForru
BiddanoaFranca
@@ -12694,7 +12694,6 @@
PS
Queen
Rai
- RAI
Ralph
Ray
Raymond
@@ -12765,7 +12764,6 @@
UFC
UK
Unesco
- UNESCO
Universal
URSS
US
@@ -51042,6 +51040,7 @@
VillacidroBiddexidru
BiddaMara
VillamarBiddaMara
+ BissaMaraBiddaMara
VillanovaforruBiddanoaForru
VillanovafrancaBiddanoaFranca
Azos
Index: languages/apertium-ita/apertium-ita.ita.dix
===================================================================
--- languages/apertium-ita/apertium-ita.ita.dix (revision 70097)
+++ languages/apertium-ita/apertium-ita.ita.dix (revision 70101)
@@ -13609,7 +13609,6 @@
Thomas
Afghanistan
ABC
- FIAT
Abad
Abel
Adam
@@ -14816,7 +14815,6 @@
Carminuccio
Giuliano
Amburgo
- Canada
Venera
Landa
Etna
@@ -15846,7 +15844,6 @@
Oschiri
Padru
LuPalau
- Sant'AntoniodiGallura
SantaTeresadiGallura
SanTeodoro
Telti
@@ -43523,6 +43520,7 @@
PatruPadru
LuPalauPalau
Sant'AntoniodiGallura
+ Sant'AntoniodiGalluraSant'AntoniodiGallura
SantuAntoni'eCalanzanusSant'AntoniodiGallura
Sant'AntoniSant'AntoniodiGallura
SantaTeresaGallura
@@ -44516,7 +44514,6 @@
raffigurant
raffigurat
Rai
- RAI
Ralph
ranking
rap
@@ -44660,7 +44657,6 @@
UFC
UK
Unesco
- UNESCO
Universal
universitari
universitari
Index: incubator/apertium-srd-ita/apertium-srd-ita.srd-ita.dix
===================================================================
--- incubator/apertium-srd-ita/apertium-srd-ita.srd-ita.dix (revision 70097)
+++ incubator/apertium-srd-ita/apertium-srd-ita.srd-ita.dix (revision 70101)
@@ -1773,7 +1773,7 @@
mancumeno
presentepresente
calequale
- dada
+ deda
prepre
antianti
propro
@@ -5804,7 +5804,7 @@
EuskadiEuskadi
FiladèlfiaFiladelfia
FirenzeFirenze
- GiaponeGiappone
+ GiapponeGiappone
GironaGirona
GuyanaGuyana
HanoiHanoi
@@ -5854,7 +5854,6 @@
SàrdaraSardara
SegariuSegariu
SerramannaSerramanna
- SanGavinoMonrealeSanGavinoMonreale
SerramannaSardara
SetzuSetzu
SiddiSiddi
@@ -5862,56 +5861,372 @@
TurriTurri
ÙssaraMannaUssaramanna
BiddexidruVillacidro
- BissaMaraVillamar
BiddanoaForruVillanovaforru
BiddanoaFrancaVillanovafranca
- AzosAggius
- AgghjuAggius
+ AbbasantaAbbasanta
AglientuAglientu
- SantuFranciscud'AglièntuAglientu
- AlàAlàdeisardi
- AlzachenaArzachena
- AltzaghenaAltzaghena
- BadesiBadesi
- BelchiddaBerchiddadeisardi
- BilchiddaBerchiddadeisardi
- BortigiadasBortigiadas
- BultigghjataBultigghjata
+ AlàAlàdeiSardi
+ ÀldaraArdara
+ AlesAbas
+ ÀllaiÀllai
+ AltzaghenaArzachena
+ AnelaAnela
+ ArboreaArborea
+ ArbusArbus
+ ArcidanuSanNicolòd'Arcidano
+ ArdauleArdauli
+ AristanisOristano
+ AritzuAritzo
+ ArmungiaArmungia
+ ArrioraRiolaSardo
+ ArruinasRuinas
+ ÀrthanaArzana
+ AssèminiAssemini
+ AssouAssolo
+ AsuniAsuni
+ AtzaraAtzara
+ AustisAustis
+ AzosAggius
+ BadesiBadesi
+ BàiniVillaVerde
+ BallauBallao
+ BànariBanari
+ BaradiliBaradile
+ BaressaBaressa
+ BarìBariSardo
+ BarraliBarrali
+ BarùminiBarumini
+ BaulauBauladu
+ BauneiBaunei
+ BelchiddaBerchidda
+ BenetuttiBenetutti
+ BessudeBessude
+ BiddadePutzuVillaputzu
+ BiddadeSartuVillasalto
+ BiddaMannaIstrisàiliVillagrandeStrisaili
+ BiddaMaraVillamar
+ BiddaSorrisVillasor
+ BiddaSpetziosaVillaspeciosa
+ BiddamatraxaVillamassargia
+ BiddanoaMonteleoneVillanovaMonteleone
+ BiddanoaTruscheduVillanovaTruschedu
+ BiddanoaTuluVillanovatulo
+ BiddaramosaVallermosa
+ BiddaubranaVillaurbana
+ BidumajoreAidomaggiore
+ BiduniuBidonì
+ BilartziGhilarza
+ BìroroBirori
+ BoàtiriBaratiliSanPietro
+ BolòtanaBolotana
+ BonàrcaduBonarcado
+ BonolvaBonorva
+ BonoBono
+ BoronedduBoroneddu
+ BòroreBòrore
+ BortigaleBortigali
+ BortigiadasBortigiadas
+ BorutaBorutta
+ BosaBosa
+ BottiddaBottidda
+ BrevìeBelvì
BuddusòBuddusò
- BudùneBudoni
- BudòniBudoni
- CalanzanusCalanzanus
- CalagnaniCalanzanus
+ BudùneBudoni
+ BuggerruBuggerru
+ BulteiBultei
+ BultziBulzi
+ BunnànnaruBonnanaro
+ BurceiBurcei
+ BusacheBusachi
+ CabuderraCapoterra
+ CalaSedaCalasetta
+ CalanzanusCalangianus
+ CardeduCardedu
+ CarlufortiCarloforte
+ CarzegheCargeghe
+ CastedduSarduCastelsardo
+ CastedduCagliari
+ CastiadasCastiadas
+ CeraxusSelargius
+ CherèmuleCheremule
+ CodaruinaValledoria
+ CodronzanuCodrongianos
+ ConesaGonnesa
+ CossoineCossoine
+ CrabasCabras
+ CrabonaxaVillasimius
+ CrabòniaCarbònia
+ CrucurisCurcuris
+ CuartuSant'AleniQuartuSant'Elena
+ CuartuciuQuartucciu
+ CùllieriCuglieri
+ CuzinasSantaMariaCoghinas
+ DèsuluDesulo
+ DèximuMannuDecimomannu
+ DèximuPutzuDecimoputzu
+ DomunoasDomusnovas
+ DomusdeMariaDomusdeMaria
+ DonòriDonòri
+ DuarcheDualchì
+ DurgaliDorgali
+ EliniElini
+ ÈrulaErula
FigariGolfoAranci
- SaMadalenaLaMaddalenadei
- AMadalenaLaMaddalenai
- Loèri-PoltuSantuPauluLoiriPortoSanPaolo
- Lòiri-PoltuSantuPauluLoiriPortoSanPaolo
+ FiolinasFlorinas
+ FlùssioFlùssio
+ FoghesuPerdasdefogu
+ FonneFonni
+ FordongianusFordongianus
+ ForruCollinas
+ FrùminiMayoriFluminimaggiore
+ FurteiFurtei
+ GadoniGadoni
+ GàiruGairo
+ GaltellìGarteddì
+ GavoiGavoi
+ GenoniGenoni
+ GenuriGenuri
+ GèsiguGesico
+ GèsturiGesturi
+ GiaveGiave
+ GibbaGiba
+ GoniGoni
+ GonnosFanàdigaGonnosfanadiga
+ GonnoscodinaGonnoscodina
+ GonnosnòGonnosnò
+ GonnostramatzaGonnostramatza
+ GuamajoriGuamaggiore
+ GuasilaGuasila
+ GùspiniGuspini
+ IersuJerzu
+ IgrèsiasIglesias
+ IlloraiIllorai
+ IrbonuIlbono
+ IrgoliIrgoli
+ IsPratzasLasPlassas
+ IscanuScanodiMontiferro
+ ÌsiliIsili
+ IsporalatuEsporlatu
+ IstertziliEsterzili
+ IstintinuStintino
+ ItiredduIttireddu
+ ÌtiriCanneduIttiri
+ JelisuliGirasole
+ LàcanaLaconi
+ LaerruLaerru
+ LanusèiLanusei
+ LeiLei
+ LoceriLoceri
+ LoculiLòcula
+ LodèLodè
+ LodineLodine
LogusantuLuogosanto
- LocusantuLuogosanto
- LùrisiLuras
- LurasLuras
- MontiMonti
- MonteMonti
- TerranoaOlbia
- TarranoaOlbia
- ÒscariOschiri
- OscheriOschiri
- OscheriPadru
+ LotzoraiLotzorai
+ LungoneSantaTeresaGallura
+ LurasLuras
+ LùvulaLula
+ MacumereMacomer
+ MagumadasMagomadas
+ MaltisMartis
+ MamujadaMamoiada
+ MandasMandas
+ MaracalagonisMaracalagonis
+ MaraMara
+ MarrùbiuMarrùbiu
+ MasainasMasainas
+ MasuddasMasullas
+ MeanaMeanaSardo
+ MirisMilis
+ MòdoloMòdolo
+ MogorellaMogoredda
+ MòguruMogoro
+ MonteleoneMonteleoneRoccaDoria
+ MonteMonti
+ MontrestaMontresta
+ MoresMores
+ MragaxoriMorgongiori
+ MureraMuravera
+ MuristeniMonastir
+ MurosMuros
+ MuseiMusei
+ NarabuiaNarbolia
+ NarcauNarcao
+ NeuneleNeoneli
+ NoragugumeNoragugume
+ NorghidduNorbello
+ NugheduSantuNigolaNugheduSanNicolò
+ NugheduNugheduSantaVittoria
+ NùgoroNuoro
+ NuleNule
+ NulviNulvi
+ NurachiNurachi
+ NuraddaNurallao
+ NuragusNuragus
+ NuràminisNuraminis
+ NureciNureci
+ NurriNurri
+ NuxisNuxis
+ OllastaOllastra
+ OllolaiOllolai
+ OnanieOnanì
+ OniaiOnifai
+ OnieriOniferi
+ OraneOrani
+ OrgòsoloOrgòsolo
+ OroseiOrosei
+ OroteddiOrotelli
+ OrroliOrroli
+ OrtacesusOrtacesus
+ OrthullèUrzulei
+ OrtueriOrtueri
+ OrtzaiOlzai
+ OruneOrune
+ OscheriOschiri
+ OsiddeOsidda
+ OsiloOsilo
+ OsiniOsini
+ OssiOssi
+ OthieriOzieri
+ OtzanaOttana
+ OvoddaOvodda
+ PabillonisPabillonis
+ PàdriaPadria
PadruPadru
- LuPalauPalau
- SantuAntonideCalanzanusSant'AntoniodiGallura
- SantuAntoniSant'AntoniodiGallura
- LungoneSantaTeresadiGallura
- LungoniSantaTeresadiGallura
- SantuTiadoruSanTeodoro
+ PalauPalau
+ PartiollaDolianova
+ PatadaPattada
+ PaulePaulilatino
+ PauliArbareiPauliArbarei
+ PauliGerreiSanNicolòGerrei
+ PauliMonserrato
+ PauPau
+ PèifugasPerfugas
+ PerdaxusPerdaxius
+ PiaghePloaghe
+ PiscinasPiscinas
+ PompuPompu
+ PortescusiPortoscuso
+ PortuTurrePortoTorres
+ PortuscusiPortoscuso
+ PotuvigariPutifigari
+ PramasPalmasArborea
+ PramenteluPimentel
+ PulaPula
+ PutumajorePozzomaggiore
+ RumanaRomana
+ SaBaroniaVillaperuccio
+ SaMadalenaLaMaddalena
+ SàdiliSadali
+ SàgamaSàgama
+ S'AligheraAlghero
+ SamassiSamassi
+ SamatzaiSamatzai
+ SamugheuSamugheo
+ SantaJustaSantaGiusta
+ SantadiSantadi
+ Sant'AnnaArresiSant'AnnaArresi
+ Sant'EruSanVeroMilis
+ Santu'AinjuSanGavinoMonreale
+ SantuAndriaFriusSant'AndreaFrius
+ SantuAntioguSant'Antioco
+ SantuAntoniArruinasVillaSant'Antonio
+ SantuAntoni'eCalanzanusSant'AntoniodiGallura
+ Santu'AsiliSanBasilio
SantuDeadoruSanTeodoro
- TeltiTelti
- TeltisTelti
+ Santu'IduSanVito
+ SantuLussurzuSantuLussurgiu
+ SantuPauluLoèriLoiriPortoSanPaolo
+ SantuPedruVillaSanPietro
+ SantuSperauSanSperate
+ Santu'UanniSruexuSanGiovanniSuergiu
+ SarrocuSarroch
+ SaruleSarule
+ ScalepranuEscalaplano
+ ScrocaEscolca
+ SéddiniSedini
+ SeddoriSanluri
+ SèdiloSèdilo
+ SèlegasSelegas
+ SemèsteneSemestene
+ SènegheSèneghe
+ SenisSenis
+ SennarioloSennariolo
+ SènnaruSennori
+ SenorbìSenorbì
+ SerdianaSerdiana
+ SerrentiSerrenti
+ SerriSerri
+ SètimuSettimo
+ SeuiSeui
+ SeuluSeulo
+ SiamannaSiamanna
+ SiddiSiddi
+ SiimajoriSiamaggiore
+ SiipiciaSiapiccia
+ SilanosSilanus
+ SilìcuaSiliqua
+ SiligoSiligo
+ SiliusSilius
+ SimaghisSimaxis
+ SìmalaSìmala
+ SindiaSindia
+ SiniSini
+ SìnniaSinnai
+ SirisSiris
+ SoddieSoddì
+ SolarussaSolarussa
+ SolèminisSoleminis
+ SòrgunuSorgono
+ SorradileSorradile
+ SòssuSorso
+ SriugusDonigallaSiurgusDonigala
+ SuBurguBurgos
+ SuMasuElmas
+ SueddiSuelli
+ S'UlumeduOlmedo
+ SuneSuni
+ TadasuneTadasuni
+ TalanaTalana
+ TàtariSassari
+ TeltisTelti
TèmpiuTempioPausania
- TrinidadeTrinitàd'AgultueVignola
- TrinitaieVignolaTrinitàd'AgultueVignola
+ TerguTergu
+ TerranoaOlbia
+ TerrarbaTerralba
+ TerteniaTertenia
+ TetiTeti
+ ThiesiThiesi
+ TìanaTìana
+ TinnuraTinnura
+ TissiTissi
+ TonaraTonara
+ TorpèTorpè
+ TortuelieTortolì
+ TrataliasTratalias
+ TresnuraghesTresnuraghes
+ TrièTriei
+ TrinitaieVignolaTrinidadeTrinitàd'AgultueVignola
+ TuiliTuili
+ TulaTula
+ TuralvaTorralba
+ TurriTurri
+ TzaramonteChiaramonti
+ TzeddianiZeddiani
+ TzorfuliuZerfaliu
+ UdaUta
+ UlaUlàTirso
+ UlassaUlassai
+ UlìanaOliena
+ UrasUras
+ UriUri
+ UseddusUsellus
+ UsiniUsini
+ ÙssanaUssana
+ UssassaUssassai
+ ViddalbaViddalba
+ VitziBitti
+ XrexeiGergei
AlighèraAlghero
@@ -13135,361 +13450,6 @@
PalermuPalermo
CastedduCagliari
- ArbusArbus
- BarùminiBarumini
- ForruCollinas
- FurteiFurtei
- GenuriGenuri
- GèsturiGesturi
- GonnosFanàdigaGonnosfanadiga
- GùspiniGuspini
- IsPratzasLasPlassas
- PabillonisPabillonis
- PauliArbareiPauliArbarei
- SamassiSamassi
- Santu'AinjuSanGavinoMonreale
- SeddoriSanluri
- SerrentiSerrenti
- SiddiSiddi
- TuiliTuili
- TurriTurri
- BiddaMaraVillamar
- AzosAggius
- AlàAlàdeiSardi
- AltzaghenaArzachena
- BadesiBadesi
- BelchiddaBerchidda
- BortigiadasBortigiadas
- BudùneBudoni
- CalanzanusCalangianus
- SaMadalenaLaMaddalena
- SantuPauluLoèriLoiriPortoSanPaolo
- LurasLuras
- MonteMonti
- OscheriOschiri
- PalauPalau
- SantuAntoni'eCalanzanusSant'AntoniodiGallura
- LungoneSantaTeresaGallura
- TeltisTelti
- TrinitaieVignolaTrinidadeTrinitàd'AgultueVignola
- AbbasantaAbbasanta
- BidumajoreAidomaggiore
- AlesAbas
- ÀllaiÀllai
- ArboreaArborea
- ArdauleArdauli
- AssouAssolo
- AsuniAsuni
- BaradiliBaradile
- BoàtiriBaratiliSanPietro
- BaressaBaressa
- BaulauBauladu
- BiduniuBidonì
- BonàrcaduBonarcado
- BoronedduBoroneddu
- BosaBosa
- BusacheBusachi
- CrabasCabras
- CùllieriCuglieri
- CrucurisCurcuris
- FlùssioFlùssio
- FordongianusFordongianus
- GenoniGenoni
- BilartziGhilarza
- GonnoscodinaGonnoscodina
- GonnosnòGonnosnò
- GonnostramatzaGonnostramatza
- LàcanaLaconi
- MagumadasMagomadas
- MarrùbiuMarrùbiu
- MasuddasMasullas
- MirisMilis
- MòdoloMòdolo
- MogorellaMogoredda
- MòguruMogoro
- MontrestaMontresta
- MragaxoriMorgongiori
- NarabuiaNarbolia
- NeuneleNeoneli
- NorghidduNorbello
- NugheduNugheduSantaVittoria
- NurachiNurachi
- NureciNureci
- OllastaOllastra
- AristanisOristano
- PramasPalmasArborea
- PauPau
- PaulePaulilatino
- PompuPompu
- ArrioraRiolaSardo
- ArruinasRuinas
- SàgamaSàgama
- SamugheuSamugheo
- ArcidanuSanNicolòd'Arcidano
- SantaJustaSantaGiusta
- SantuLussurzuSantuLussurgiu
- Sant'EruSanVeroMilis
- IscanuScanodiMontiferro
- SèdiloSèdilo
- SènegheSèneghe
- SenisSenis
- SennarioloSennariolo
- SiimajoriSiamaggiore
- SiamannaSiamanna
- SiipiciaSiapiccia
- SìmalaSìmala
- SimaghisSimaxis
- SiniSini
- SirisSiris
- SoddieSoddì
- SolarussaSolarussa
- SorradileSorradile
- SuneSuni
- TadasuneTadasuni
- TerrarbaTerralba
- TinnuraTinnura
- TresnuraghesTresnuraghes
- UlaUlàTirso
- UrasUras
- UseddusUsellus
- BiddanoaTruscheduVillanovaTruschedu
- SantuAntoniArruinasVillaSant'Antonio
- BiddaubranaVillaurbana
- BàiniVillaVerde
- TzeddianiZeddiani
- TzorfuliuZerfaliu
- AritzuAritzo
- AtzaraAtzara
- AustisAustis
- BrevìeBelvì
- BìroroBirori
- VitziBitti
- BolòtanaBolotana
- BòroreBòrore
- BortigaleBortigali
- DèsuluDesulo
- DurgaliDorgali
- DuarcheDualchì
- FonneFonni
- GadoniGadoni
- GaltellìGarteddì
- GavoiGavoi
- IrgoliIrgoli
- LeiLei
- LoculiLòcula
- LodèLodè
- LodineLodine
- LùvulaLula
- MacumereMacomer
- MamujadaMamoiada
- MeanaMeanaSardo
- NoragugumeNoragugume
- NùgoroNuoro
- UlìanaOliena
- OllolaiOllolai
- OrtzaiOlzai
- OnanieOnanì
- OniaiOnifai
- OnieriOniferi
- OraneOrani
- OrgòsoloOrgòsolo
- OroseiOrosei
- OroteddiOrotelli
- OrtueriOrtueri
- OruneOrune
- OsiddeOsidda
- OtzanaOttana
- OvoddaOvodda
- SaruleSarule
- SilanosSilanus
- SindiaSindia
- SòrgunuSorgono
- TetiTeti
- TìanaTìana
- TonaraTonara
- TorpèTorpè
- S'AligheraAlghero
- AnelaAnela
- ÀldaraArdara
- BànariBanari
- BenetuttiBenetutti
- BessudeBessude
- BunnànnaruBonnanaro
- BonoBono
- BonolvaBonorva
- BorutaBorutta
- BottiddaBottidda
- BulteiBultei
- BultziBulzi
- SuBurguBurgos
- CarzegheCargeghe
- CastedduSarduCastelsardo
- CherèmuleCheremule
- TzaramonteChiaramonti
- CodronzanuCodrongianos
- CossoineCossoine
- ÈrulaErula
- IsporalatuEsporlatu
- FiolinasFlorinas
- GiaveGiave
- IlloraiIllorai
- ItiredduIttireddu
- ÌtiriCanneduIttiri
- LaerruLaerru
- MaraMara
- MaltisMartis
- MonteleoneMonteleoneRoccaDoria
- MoresMores
- MurosMuros
- NugheduSantuNigolaNugheduSanNicolò
- NuleNule
- NulviNulvi
- S'UlumeduOlmedo
- OsiloOsilo
- OssiOssi
- OthieriOzieri
- PàdriaPadria
- PatadaPattada
- PèifugasPerfugas
- PiaghePloaghe
- PortuTurrePortoTorres
- PutumajorePozzomaggiore
- PotuvigariPutifigari
- RumanaRomana
- CuzinasSantaMariaCoghinas
- TàtariSassari
- SéddiniSedini
- SemèsteneSemestene
- SènnaruSennori
- SiligoSiligo
- SòssuSorso
- IstintinuStintino
- TerguTergu
- ThiesiThiesi
- TissiTissi
- TuralvaTorralba
- TulaTula
- UriUri
- UsiniUsini
- CodaruinaValledoria
- ViddalbaViddalba
- BiddanoaMonteleoneVillanovaMonteleone
- ÀrthanaArzana
- BarìBariSardo
- BauneiBaunei
- CardeduCardedu
- EliniElini
- GàiruGairo
- JelisuliGirasole
- IrbonuIlbono
- IersuJerzu
- LanusèiLanusei
- LoceriLoceri
- LotzoraiLotzorai
- OsiniOsini
- FoghesuPerdasdefogu
- SeuiSeui
- TalanaTalana
- TerteniaTertenia
- TortuelieTortolì
- TrièTriei
- UlassaUlassai
- OrthullèUrzulei
- UssassaUssassai
- BiddaMannaIstrisàiliVillagrandeStrisaili
- BuggerruBuggerru
- CalaSedaCalasetta
- CrabòniaCarbònia
- CarlufortiCarloforte
- DomunoasDomusnovas
- FrùminiMayoriFluminimaggiore
- GibbaGiba
- ConesaGonnesa
- IgrèsiasIglesias
- MasainasMasainas
- MuseiMusei
- NarcauNarcao
- NuxisNuxis
- PerdaxusPerdaxius
- PiscinasPiscinas
- PortescusiPortoscuso
- PortuscusiPortoscuso
- Santu'UanniSruexuSanGiovanniSuergiu
- SantadiSantadi
- Sant'AnnaArresiSant'AnnaArresi
- SantuAntioguSant'Antioco
- TrataliasTratalias
- BiddamatraxaVillamassargia
- SaBaroniaVillaperuccio
- ArmungiaArmungia
- AssèminiAssemini
- BallauBallao
- BarraliBarrali
- BurceiBurcei
- CastedduCagliari
- CabuderraCapoterra
- CastiadasCastiadas
- DèximuMannuDecimomannu
- DèximuPutzuDecimoputzu
- PartiollaDolianova
- DomusdeMariaDomusdeMaria
- DonòriDonòri
- SuMasuElmas
- ScalepranuEscalaplano
- ScrocaEscolca
- IstertziliEsterzili
- XrexeiGergei
- GèsiguGesico
- GoniGoni
- GuamajoriGuamaggiore
- GuasilaGuasila
- ÌsiliIsili
- MandasMandas
- MaracalagonisMaracalagonis
- MuristeniMonastir
- PauliMonserrato
- MureraMuravera
- NuragusNuragus
- NuraddaNurallao
- NuràminisNuraminis
- NurriNurri
- OrroliOrroli
- OrtacesusOrtacesus
- PramenteluPimentel
- PulaPula
- CuartuciuQuartucciu
- CuartuSant'AleniQuartuSant'Elena
- SàdiliSadali
- SamatzaiSamatzai
- Santu'AsiliSanBasilio
- PauliGerreiSanNicolòGerrei
- SantuSperauSanSperate
- SantuAndriaFriusSant'AndreaFrius
- Santu'IduSanVito
- SarrocuSarroch
- CeraxusSelargius
- SèlegasSelegas
- SenorbìSenorbì
- SerdianaSerdiana
- SerriSerri
- SètimuSettimo
- SeuluSeulo
- SilìcuaSiliqua
- SiliusSilius
- SìnniaSinnai
- SriugusDonigallaSiurgusDonigala
- SolèminisSoleminis
- SueddiSuelli
- ÙssanaUssana
- UdaUta
- BiddaramosaVallermosa
- BiddanoaTuluVillanovatulo
- BiddadePutzuVillaputzu
- BiddadeSartuVillasalto
- SantuPedruVillaSanPietro
- CrabonaxaVillasimius
- BiddaSorrisVillasor
- BiddaSpetziosaVillaspeciosa
SirSir
LordLord
@@ -13847,7 +13807,6 @@
PSPS
QueenQueen
RaiRai
- RAIRAI
RalphRalph
RaymondRaymond
RaymondRaymond
@@ -13928,7 +13887,6 @@
UFCUFC
UKUK
UnescoUnesco
- UNESCOUNESCO
UniversalUniversal
URSSURSS
USUS
@@ -13986,7 +13944,6 @@
CaballéCaballé
CadillacCadillac
CalifòrniaCalifornia
- CanadaCanada
CannesCannes
CardiffCardiff
CarìntziaCarinzia
Index: incubator/apertium-srd-ita/dev/testvoc/generation.sh
===================================================================
--- incubator/apertium-srd-ita/dev/testvoc/generation.sh (revision 70097)
+++ incubator/apertium-srd-ita/dev/testvoc/generation.sh (revision 70101)
@@ -2,28 +2,6 @@
set -e -u
-# You can override the below variables by doing e.g.
-# $ export CYCLES=1 BLOCK=1M
-# before running this script.
-
-# How many times to follow cycle when expanding with --hfst; gets slow if too high:
-declare -ir CYCLES=${CYCLES-0}
-# How many parallel pipelines to run (requires GNU parallel installed;
-# only worth increasing if CPU's are not saturated and there's free
-# RAM while running):
-declare -ir J=${J-1}
-# How much data to translate before restarting the pipeline (some
-# pipelines have memory leaks and need restarting every so often):
-declare -r BLOCK=${BLOCK:-100M}
-
-
-if [[ $# -ge 1 && $1 = --hfst ]]; then
- HFST=true
- shift
-else
- HFST=false
-fi
-
if [[ $# -eq 1 ]]; then
mode=$1
dix=guess
@@ -34,63 +12,27 @@
cat >&2 <]:' '
- /:<:/ {next}
- $2 ~ /|DUE_TO_LT_PROC_HANG|__REGEXP__/ {next}
- {
- esc=$2
- gsub("/","\\/",esc)
- gsub("^","\\^",esc)
- gsub("$","\\$",esc)
- print "["esc"] ^"$1"/"$2"$ ^./."clb"$"
- }'
-}
-
-analyser_to_hfst () {
- case "$(head -c4 "$1")" in
- HFST)
- hfst-fst2fst -t "$1"
- ;;
- *) # lttoolbox bin's start with their 's :(
- lt-print "$1" \
+ lt-print "$1".automorf.bin \
| sed 's/ /@_SPACE_@/g' \
- | hfst-txt2fst -e ε
- ;;
- esac
-}
-
-analysis_expansion_hfst () {
- analyser_to_hfst "$1" \
+ | hfst-txt2fst -e ε \
| hfst-project -p lower \
- | hfst-fst2strings -c"${CYCLES}" \
+ | hfst-fst2strings -c0 \
| awk -v clb="$2" '
/[][$^{}\\]/{next} # skip escaping hell
- /|DUE_TO_LT_PROC_HANG|__REGEXP__/ {next}
{
gsub("]","\\]")
esc=$0
@@ -102,105 +44,55 @@
# give the "disambiguated" output, no forms
}
-only_errs () {
- if [[ $# -ge 1 && $1 = --no-@ ]]; then
- atfilter () { grep -v '].*/@'; }
+split_ambig () {
+ if command -V pypy3 &>/dev/null; then
+ python=pypy3
else
- atfilter () { cat; }
+ python=python3
fi
- # turn escaped SOLIDUS into DIVISION SLASH, so we don't grep correct stuff ("A/S" is a possible lemma)
- sed 's%\\/%∕%g' |\
- atfilter |\
- grep '][^<]*[#/]'
+ PYTHONPATH="$(dirname "$0"):${PYTHONPATH:-}" "${python}" -c '
+from streamparser import parse_file, readingToString
+import sys
+for blank, lu in parse_file(sys.stdin, withText=True):
+ print(blank+" ".join("^{}/{}$".format(lu.wordform, readingToString(r))
+ for r in lu.readings),
+ end="")'
+
}
-run_mode () {
- if command -V parallel &>/dev/null; then
- parallel -j"$J" --pipe --block "${BLOCK}" -- bash "$@"
- else
- bash "$@"
- fi
+mode_after_analysis ()
+{
+ eval $(grep '|' "$1" |\
+ sed 's/[^|]*|//' |\
+ sed 's/.*apertium-pretransfer/apertium-pretransfer/' |\
+ sed 's/lt-proc -p[^|]*/cat/' |\
+ sed 's/autobil.bin *|/& split_ambig |/' |\
+ sed 's/\$1/-d/g;s/\$2//g')
+ # lt-proc -p fails
}
-declare -a TMPFILES
-cleanup () {
- for f in "${TMPFILES[@]}"; do
- rm -f "$f"
- done
+only_errs () {
+ grep '][^<]*[#/]'
}
-trap 'cleanup' EXIT
-PYTHONPATH="$(dirname "$0"):${PYTHONPATH:-}"
-export PYTHONPATH
-if command -V pypy3 &>/dev/null; then
- python=pypy3
-else
- python=python3
+lang1=${mode%%-*}
+
+if [[ ${dix} = guess ]]; then
+ lang1dir=$(grep -m1 "^AP_SRC.*apertium-${lang1}" config.log | sed "s/^[^=]*='//;s/'$//")
+ dix=${lang1dir}/apertium-${lang1}.${lang1}.dix
fi
-split_ambig=$(mktemp -t gentestvoc.XXXXXXXXXXX)
-TMPFILES+=("${split_ambig}")
-cat >"${split_ambig}" < "${mode_after_analysis}"
-
-mode_after_tagger=$(mktemp -t gentestvoc.XXXXXXXXXXX)
-TMPFILES+=("${mode_after_tagger}")
-grep '|' modes/"${mode}".mode \
- | sed 's/[^|]*|//' \
- | sed 's/.*apertium-pretransfer/apertium-pretransfer/' \
- | sed 's/lt-proc -p[^|]*/cat/' \
- | sed "s%autobil.bin'* *|%& ${split_ambig} |%" \
- | sed 's/\$1/-d/g;s/\$2//g' \
- > "${mode_after_tagger}"
-# lt-proc -p fails, that's why we remove that
-
-
-lang1=${mode%%-*}
-
clb=""
case ${lang1} in
nno|nob) clb="" ;;
esac
-if $HFST; then
- if [[ ${dix} = guess ]]; then
- dix=$(xmllint --xpath "string(/modes/mode[@name = '${mode}']/pipeline/program[1]/file[1]/@name)" modes.xml)
- fi
- analysis_expansion_hfst "${dix}" "${clb}" \
- | run_mode "${mode_after_tagger}" \
+# Make it possible to edit the .dix while testvoc is running:
+dixtmp=$(mktemp -t gentestvoc.XXXXXXXXXXX)
+trap 'rm -f "${dixtmp}"' EXIT
+cat "${dix}" > "${dixtmp}"
+
+analysis_expansion "${mode}" "${clb}" \
+ | mode_after_analysis modes/"${mode}".mode \
| only_errs
-else
- if [[ ${dix} = guess ]]; then
- lang1dir=$(grep -m1 "^AP_SRC.*apertium-${lang1}" config.log | sed "s/^[^=]*='//;s/'$//")
- dix=${lang1dir}/apertium-${lang1}.${lang1}.dix
- fi
- # Make it possible to edit the .dix while testvoc is running:
- dixtmp=$(mktemp -t gentestvoc.XXXXXXXXXXX)
- TMPFILES+=("${dixtmp}")
- cat "${dix}" > "${dixtmp}"
- analysis_expansion "${dixtmp}" "${clb}" \
- | run_mode "${mode_after_analysis}" \
- | only_errs --no-@
-fi
Index: incubator/apertium-srd-ita/dev/testvoc/streamparser.py
===================================================================
--- incubator/apertium-srd-ita/dev/testvoc/streamparser.py (revision 70097)
+++ incubator/apertium-srd-ita/dev/testvoc/streamparser.py (revision 70101)
@@ -9,36 +9,7 @@
import re, pprint, sys, itertools, fileinput
from collections import namedtuple
-
-class Knownness:
- __doc__ = """Level of knowledge associated with a lexical unit.
- Values:
- known
- unknown: Denoted by '*', analysis not available.
- biunknown: Denoted by '@', translation not available.
- genunknown: Denoted by '#', generated form not available.
-"""
- symbol = ""
-
-class known(Knownness):
- pass
-class unknown(Knownness):
- symbol = "*"
-class biunknown(Knownness):
- symbol = "@"
-class genunknown(Knownness):
- symbol = "#"
-
SReading = namedtuple('SReading', ['baseform', 'tags'])
-try:
- SReading.__doc__ = """A single subreading of an analysis of a token.
- Fields:
- baseform (str): The base form (lemma, lexical form, citation form) of the reading.
- tags (list of str): The morphological tags associated with the reading.
-"""
-except AttributeError:
- # Python 3.2 users have to read the source
- pass
def subreadingToString(sub):
return sub.baseform+"".join("<"+t+">" for t in sub.tags)
@@ -68,10 +39,8 @@
lexicalUnit (str): The lexical unit in Apertium stream format.
wordform (str): The word form (surface form) of the lexical unit.
readings (list of list of SReading): The analyses of the lexical unit with sublists containing all subreadings.
- knownness (Knownness): The level of knowledge of the lexical unit.
"""
- knownness = known
def __init__(self, lexicalUnit):
self.lexicalUnit = lexicalUnit
@@ -82,7 +51,8 @@
self.readings = []
for reading in readings:
if len(reading) < 1:
- print("WARNING: Empty readings for {}".format(self.lexicalUnit), file=sys.stderr)
+ #print("WARNING: Empty readings for {}".format(self.lexicalUnit), file=sys.stderr)
+ pass
elif reading[0] not in '*#@':
subreadings = []
@@ -94,8 +64,6 @@
subreadings.append(SReading(baseform=baseform, tags=tags))
self.readings.append(subreadings)
- else:
- self.knownness = {'*': unknown, '@': biunknown, '#': genunknown}[readings[0][0]]
def __repr__(self):
return self.lexicalUnit