Skip to content

Commit

Permalink
Adding changes #29723066070610
Browse files Browse the repository at this point in the history
  • Loading branch information
richardcastro committed Mar 20, 2015
1 parent 62f69f8 commit d50b886
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 14 deletions.
21 changes: 12 additions & 9 deletions asheninka.script
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,8 @@
define QUReplacement [ {k} (->) {qu} || _ [e|i|é|í] ,, {k} (->) {qü} || _ [e|i|é|í] ];
define CReplacement [ {k} (->) {c} || _ [a|o|u|á|é|í] ];

define JReplacement [ {h} (->) {j} || Vowels _ Vowels ]; # not accepting sh -> sj
define JReplacement1 [ {h} (->) {j} || Vowels _ Vowels ]; # not accepting sh -> sj
define JReplacement2 [ {h} (->) {j} || .#. _ Vowels ]; # changing ja -> ha at the beginning of a word

define BReplacement [ {v} (->) {b} || _ Vowels ];
define WReplacement [ {v} (->) {w} || _ Vowels ];
Expand All @@ -42,7 +43,9 @@
define NYReplacement [ {ny} (->) {ñ} || _ Vowels ];
define VowelsWithAccent [ {a} (->) {á}, {e} (->) {é}, {i} (->) {í},{o} (->) {ó}, {u} (->) {ú}];

define Orthography [ QUIReplacement .o. QUReplacement .o. CReplacement .o. JReplacement .o. BReplacement .o. WReplacement
define Orthography [ QUIReplacement .o. QUReplacement .o. CReplacement
.o. JReplacement1 .o. JReplacement2
.o. BReplacement .o. WReplacement
.o. PIReplacement .o. KIReplacement .o. RIReplacement .o. TIReplacement .o. THReplacement .o. NYReplacement .o. VowelsWithAccent ];

##########################
Expand Down Expand Up @@ -114,10 +117,10 @@
# define TransSubj5 [ "[1PL.A+]" <- "[1PL.S+]" || _ ?* "[+1PL.O]"];
# define VerbRules TransSubj1 .o. TransSubj2 .o. TransSubj3 .o. TransSubj4 .o. TransSubj5 ;

source v-s-1.foma
source v-s-2.foma
source v-s-3.foma
source v-s-4.foma
# source v-s-1.foma
# source v-s-2.foma
# source v-s-3.foma
# source v-s-4.foma
# source v-s-5.foma
# source v-s-6.foma
# source v-s-7.foma
Expand Down Expand Up @@ -160,9 +163,9 @@
source n-p-1.foma
define NPref [(N=P=1)] ;

source n-s-1.foma
source n-s-2.foma
source n-s-3.foma
# source n-s-1.foma
# source n-s-2.foma
# source n-s-3.foma
source noun.suffix.prq.script
source noun.transitions.prq.script

Expand Down
8 changes: 3 additions & 5 deletions vroot.prq.foma
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ define VRootPRQin [
| "[VRoot][=drink][=ir]" : {ir}
| "[VRoot][=cry][=ira]" : [{ira}|{irag}|{irah}]
| "[VRoot][=identify.as.a.witch][=itamatzi]" : {itamatzi}
| "[VRoot][=go][=iyaa]" : {iyaa}
| "[VRoot][=pour][=kaa]" : {kaa}
| "[VRoot][=bathe][=kaa]" : {kaa}
| "[VRoot][=NEG.COP][=kaari]" : {kaari}
Expand Down Expand Up @@ -268,11 +269,7 @@ define VRootPRQin [
| "[VRoot][=heat][=saava]" : {saava}
| "[VRoot][=pour][=sai]" : {sai}
| "[VRoot][=empty][=sai]" : {sai}
| "[VRoot][=be][=saik]" : {saik}
| "[VRoot][=be.at][=saik]" : {saik}
| "[VRoot][=be.in][=saik]" : {saik}
| "[VRoot][=sit][=saik]" : {saik}
| "[VRoot][=live][=saik]" : [{saik}|{saek}]
| "[VRoot][=be, be.at, be.in, sit, live][=saik]" : [{saik}|{saek}]
| "[VRoot][=get.upset.with][=sam]" : {sam}
| "[VRoot][=write, draw][=sankina]" : [{sankina}|{sankena}|{jankena}|{jankina}]
| "[VRoot][=ask][=sampi]" : {sampi}
Expand Down Expand Up @@ -371,6 +368,7 @@ define VRootPRQin [
| "[VRoot][=get.fat, gain.weight][=vatsa]" : {vatsa}
| "[VRoot][=be.warrior][=vayeri]" : {vayeri}
| "[VRoot][=fade][=veha]" : {veha}
| "[VRoot][=advance][=vira]" : {vira}
| "[VRoot][=visit][=vitsa]" : {vitsa}
| "[VRoot][=greet][=vitsa]" : {vitsa}
| "[VRoot][=fix, make, create, build][=vitsik]" : [{vitsik}|{vetsik}]
Expand Down

0 comments on commit d50b886

Please sign in to comment.