Index: incubator/apertium-scn/apertium-scn.scn.dix
===================================================================
--- incubator/apertium-scn/apertium-scn.scn.dix (revision 71372)
+++ incubator/apertium-scn/apertium-scn.scn.dix (revision 71375)
@@ -263,6 +263,7 @@
+
@@ -276,6 +277,11 @@
+
+
+
+
+
uu
au
@@ -814,12 +820,11 @@
nnta
innta
-
+
nnôntalu
nnûntalu
nnântalu
@@ -1000,11 +1005,14 @@
mimi
sisi
lulu
- cici
- nini
+ ccicci
+ nninni
+ cicci
+ ninni
lulu
lalu
- lilu
+ lilu
+ lilu
@@ -1013,9 +1021,13 @@
lulu
cici
nini
+ ccicci
+ nninni
lulu
lalu
- lilu
+ lilu
+ lilu
+
@@ -1147,13 +1159,6 @@
hannu
annu
- haiu
- hai
- havi
- avemu
- aviti
- hannu
-
hai
havi
avemu
@@ -1355,6 +1360,10 @@
ariari
anuari
unuari
+
+
@@ -3454,6 +3463,8 @@
ivennuìviri
ivennuìviri
+ iviennuìviri
+ iviennuìviri
@@ -5809,11 +5820,13 @@
nuatri
nuautrinuatri
nuiatrinuatri
+ nuinuatri
nuiàtrinuatri
nuàutrinuatri
vuatri
vuautrivuatri
vuiatrivuatri
+ vuivuatri
vuiàtrinuatri
vuàutrinuatri
@@ -5822,7 +5835,9 @@
si
sasi
vi
+ ni
+
hi
hièhi
@@ -6063,7 +6078,8 @@
palorparol
paràulparol
acrònim
-
+ riform
+
russ
spagnuol
talian
@@ -6559,7 +6575,10 @@
cantautur
pinzatur
pittur
+ pridicatur
+
+
basi
varianti
cantanti
@@ -8750,8 +8769,6 @@
chiavett
ciavettchiavett
chicatur
- chies
- chifilchies
chin
chinizz
chiov
@@ -18561,7 +18578,6 @@
aiutajut
magliettmagghiett
zampjamm
- putiput
zampjamm
iammjamm
giòmitgiometr
@@ -22551,6 +22567,7 @@
scuzzisi
viulàbbili
+ prutistanti
@@ -22559,6 +22576,7 @@
mòbbili
vulgari
ditirminanti
+ ortudoss
giusnaturalìstic
@@ -26431,6 +26449,8 @@
arrass
arripizz
arrubb
+ arrubarrubb
+
arruccul
arruci
arrunz
@@ -27443,6 +27463,9 @@
agnun
airus
ajutaiut
+ ajùtaiut
+ aiùtaiut
+
allaccar
allaccarallaccari
allambirs
@@ -29395,7 +29418,20 @@
nvistulmmistul
mmudurr
mor
- mov
+ mòv
+ muvmòv
+ movmòv
+ mòvmòv
+ movmòv
+
+ prumòv
+ prumuvprumòv
+ prumovprumòv
+ prumòvprumòv
+ prumovprumòv
+ promuovprumòv
+
+ rafridd
mpassul
mpenn
ncancar
@@ -29458,7 +29494,6 @@
profutt
prumitt
prumettprumitt
- prumov
risist
ristitu
sbattbatt
@@ -29836,6 +29871,8 @@
cònzcunz
arrobbarrubb
arròbbarrubb
+ arrobarrubb
+ arròbarrubb
allongallung
allòngallung
pospus
@@ -30861,6 +30898,7 @@
annùnzannunz
visìtvisit
arrùbbarrubb
+ arrùbarrubb
accumunìaccumuni
arràzzarrazz
nzìvnziv
@@ -31931,8 +31969,6 @@
mmudùrrmmudurr
mòrmor
mòrmor
- mòvmov
- mòvmov
mpassùlmpassul
mpassùlmpassul
mpènnmpenn
@@ -32037,8 +32073,6 @@
profùttprofutt
prumìttprumitt
prumìttprumitt
- prumòvprumov
- prumòvprumov
pìrdpird
pìrdpird
prùdprud
Index: incubator/apertium-scn/apertium-scn.scn.rlx
===================================================================
--- incubator/apertium-scn/apertium-scn.scn.rlx (revision 71372)
+++ incubator/apertium-scn/apertium-scn.scn.rlx (revision 71375)
@@ -13,13 +13,14 @@
LIST Rel = rel ;
LIST CS = cnjsub ;
LIST Prop = np ;
-LIST Verb = vblex vbhaver vbmod vbser ;
+LIST Vblex = (vblex) ;
+LIST Vbmod = (vbmod) ;
+LIST Vbhaver = (vbhaver) ;
+LIST Vbser = (vbser);
LIST Num = num ;
-
-
LIST Pr = pr ;
-LIST PrDet = pr det;
+LIST Prn/si = (prn pro ref p3);
LIST Prep/di = ""i ""i ;
LIST Prep/a = ""i ""i ;
@@ -34,23 +35,24 @@
LIST CC/o = "" ;
LIST CS/ca = "" ;
-LIST Haver = vbhaver ;
-LIST Ser = vbser ;
LIST Inf = inf ;
LIST Det/unu = (det ind m sg);
LIST Det/una = (det ind f sg);
-LIST Det/luMscPl = (det def m pl);
-LIST Det/luFemPl = (det def f pl);
+LIST DetIndMscPl = (det ind m pl);
+LIST DetIndFemPl = (det ind f pl);
+LIST DetDefMscPl = (det def m pl);
+LIST DetDefFemPl = (det def f pl);
+LIST DetDemMscPl = (det dem m pl);
+LIST DetDemFemPl = (det dem f pl);
+LIST nuddu = "" ;
+
LIST Chi = "" ;
LIST Cristianu = "cristianu" ;
-LIST Imper = imp ;
-LIST PrfPrc = pp ;
-
LIST Sg3 = (p3 sg) ;
LIST ProRef = (prn pro ref) ;
@@ -63,19 +65,49 @@
LIST Pl = pl ;
LIST Sp = sp ;
+# Adjectives
LIST Adj/pl = (adj pl) ;
+LIST Adj/mf/sp = (adj mf sp) ;
+
# Nouns
LIST N/MscPl = (n m pl) ;
LIST N/MscSg = (n m sg) ;
LIST N/FemPl = (n f pl) ;
LIST N/FemSg = (n f sg) ;
+LIST N/mf = (n mf) ;
+LIST N/f/sp = (n f sp) ;
+LIST N/m/sp = (n m sp) ;
+LIST N/m = (n m) ;
+LIST N/f = (n f) ;
+LIST N/pl = (n pl) ;
+LIST Pii = pii ;
LIST Ifi = ifi ;
LIST Pri = pri ;
+LIST Fti = fti ;
+LIST Prs = prs ;
+LIST Fts = fts ;
+LIST Pis = pis ;
+LIST Gerund = ger ;
+LIST Imper = imp ;
+LIST PrfPrc = pp ;
+
+LIST Pii/p1 = (pii p1) ;
+LIST Pii/p2 = (pii p2) ;
+LIST Pii/p3 = (pii p3) ;
+
+LIST Pis/p1 = (pis p1) ;
+LIST Pis/p2 = (pis p3) ;
+LIST Pis/p3 = (pis p3) ;
+
+LIST P1 = p1;
+LIST P2 = p2;
+LIST P3 = p3;
+
LIST Msc = m ;
LIST Fem = f ;
LIST MscFem = mf ;
@@ -96,9 +128,13 @@
SET Fin = Ifi | Pri ;
+SET Verb = Vblex OR Vbmod OR Vbhaver OR Vbser ;
+SET NonFiniteForm = Ifi OR Pis OR Pri OR Fti OR Fts OR Prs OR Imper OR Pii;
+SET FiniteForm = Inf OR PrfPrc or Gerund;
+
SECTION
@@ -113,7 +149,7 @@
SELECT A + $$Genero IF (-1C N + $$Genero) ;
-SELECT Haver IF (1C PrfPrc) ;
+SELECT Vbhaver IF (1C PrfPrc) ;
SELECT Sg3 IF (-1 ProRef) ;
# Nun si sapi quannu ci fu l’affirmazzioni di lu Cristianèsimu a Catania.
@@ -135,12 +171,11 @@
SELECT N IF (-1 Det OR Pr) (0 Cristianu) ;
-
-SELECT Pr IF (0 Pr OR PrDet) (1 Inf) ;
+SELECT Pr IF (0 Pr OR Pr LINK 0/* Det) (1 Inf) ;
# Pi fari lu jurnalista prufissiuntista ...
-SELECT Pr IF (0 Pr OR PrDet) (1 Det) ;
+SELECT Pr IF (0 Pr OR Pr LINK 0/* Det) (1 Det) ;
# Nta lu Òrdini prufissiunali
@@ -147,7 +182,7 @@
SELECT CS IF (1 Verb) ;
# UBS è na banca ca havi la sedi principali nta Svìzzira.
-SELECT Det IF (-1C Ser) (0 Det) (0 Pr LINK 0/* Det) ;
+SELECT Det IF (-1C Vbser) (0 Det) (0 Pr LINK 0/* Det) ;
# UBS è na banca
SELECT CS IF (1 Verb) ;
@@ -156,9 +191,9 @@
# Construcción "nu/na di li ..."
SELECT Det/unu IF (0 Det/unu OR Num) (1 Prep/di) ;
-SELECT Det/luMscPl IF (-2 Det/unu) (-1 Prep/di) (0 Det/luFemPl OR Det/luMscPl);
+SELECT DetIndMscPl IF (-2 Det/unu) (-1 Prep/di) (0 DetIndFemPl OR DetIndMscPl);
-SELECT Det/luFemPl IF (-2 Det/una) (-1 Prep/di) (0 Det/luFemPl OR Det/luMscPl);
+SELECT DetIndFemPl IF (-2 Det/una) (-1 Prep/di) (0 DetIndFemPl OR DetIndMscPl);
SELECT N/MscPl IF (-3 Det/unu) (-2 Prep/di) (-1 Det) (0 N/MscPl OR N/FemPl) ;
# Fibbonacci fu unu di li matimàtici granni.
@@ -165,8 +200,45 @@
SELECT N/FemPl IF (-3 Det/una) (-2 Prep/di) (-1 Det) (0 N/MscPl OR N/FemPl) ;
# Chiara Strazzulla è na di li littirati siciliani.
+
+SELECT DetIndMscPl IF (0 DetIndMscPl OR DetIndFemPl) (1 N/mf + $$Pl) ;
+SELECT DetDemMscPl IF (0 DetDemMscPl OR DetDemFemPl) (1 N/m/sp) ;
+SELECT DetDemFemPl IF (0 DetDemMscPl OR DetDemFemPl) (1 N/f/sp) ;
+
+SELECT Pron IF (0 nuddu) (1 Verb) ;
+
+SELECT P3 IF (NOT -1C Pron + $$P1) (0 Pii/p1 OR Pii/p3) ;
+
+SELECT P1 IF (-1C Pron + $$P1) (0 Pii/p1 OR Pii/p3) ;
+
+SELECT P3 IF (NOT -1C Pron + $$P1 OR Pron + $$P2) (0 Pis/p1 OR Pis/p2 OR Pis/p3 ) ;
+
+SELECT P2 IF (-1C Pron + $$P2) (0 Pis/p1 OR Pis/p2 OR Pis/p3 ) ;
+
+SELECT P1 IF (-1C Pron + $$P1) (0 Pis/p1 OR Pis/p2 OR Pis/p3 ) ;
+
+SELECT N IF (-1 Det OR Pr LINK 0/* Det) (0 N + $$Msc OR Verb + $$P1) ;
+#Munnu/munnari
+
+SELECT N IF (-1 Det OR Pr LINK 0/* Det) (0 N + $$Fem OR Verb + $$P3) ;
+#Acqua/acquari
+
+SELECT Vblex IF (0 Vbhaver or Vblex) (1 Det) (2 N) ;
+
+SELECT Vblex IF (0 Vbhaver or Vblex) (1 N) ;
+
+SELECT Pr IF (0 Pr or Det + $$Ind) (1 Prop) ;
+
+SELECT Pron IF (0 Prn/si or Vbser + $$P2) (1 Vblex + $$NonFiniteForm) ;
+
+SELECT Msc IF (0 Adj/pl + $$Msc OR Adj/pl + $$Fem) (1 N/pl + $$Msc) ;
+
+SELECT Fem IF (0 Adj/pl + $$Msc OR Adj/pl + $$Fem) (1 N/pl + $$Fem) ;
+
+
+
AFTER-SECTIONS
REMOVE SUB:1 Det (NOT 0 Imper) ;