Skip to content

Commit

Permalink
Städat bort utkommenterat, mindre ändring av a1-affix
Browse files Browse the repository at this point in the history
  • Loading branch information
@linalejdebro
linalejdebro committed Dec 8, 2023
1 parent 3430ce1 commit 7ea2dd2
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 77 deletions.
3 changes: 2 additions & 1 deletion src/fst/affixes/adjectives.lexc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ LEXICON a1
!! **LEXICON @LEXNAME@** adding **+A** and sending to **x1**, and to *3comp, 3sup*.
+A: x1 ; !!≈ * @CODE@
+A+Comp: 3comp ; !!≈ * @CODE@
+A+Superl:ime 3sup ; !!≈ * @CODE@
!+A+Superl:ime 3sup ; !!≈ * @CODE@
+A+Superl: 3sup ; !!≈ * @CODE@


LEXICON a2
Expand Down
4 changes: 2 additions & 2 deletions src/fst/affixes/pronouns.lexc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ LEXICON relkys
+Nom+Clt:%>k^As # ;
+Gen:%>nk^A K ;
+Gen+Clt:%>nk^As # ;
+Ill:%>%>h^Vn K ;
+Ill:%>%>h^Vnk^A K ;
+Ill:%>h^Vn K ;
+Ill:%>h^Vnk^A K ;
+Par:%>t^A K ;
+Par+Clt:%>t^As # ;
+Ess:%>n^A K ;
Expand Down
74 changes: 1 addition & 73 deletions src/fst/phonology.twolc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,8 +173,6 @@ n:0 <=> Vow n _ Vow: [%^HMETA: |%^HMET2:] ;





!! **p rules**

"p:0"
Expand Down Expand Up @@ -370,40 +368,24 @@ v:0 <=> Vow v _ Vow: [%^HMETA: |%^HMET2:] ;
"Gemination 0:j"
!! **RULE: @RULENAME@**
0:j <=> [.#.|#] Cns:* Vow j _ :a (Dummy:) %> (h) :a ; ! [:a|i2:|%^V:] ;
! [.#.|#] Cns:* Vow j _ a: (Dummy:) %> (h) :a :a ; ! [:a|i2:|%^V:] ;
[.#.|#] Cns:* Vow j _ :e (Dummy:) %> (h) :e ;
! [.#.|#] Cns:* Vow j _ e: (Dummy:) %> h :e :e ;
[.#.|#] Cns:* Vow j _ :i (Dummy:) %> (h) :i ;
! [.#.|#] Cns:* Vow j _ i: (Dummy:) %> h :i :i ;
[.#.|#] Cns:* Vow j _ o (Dummy:) %> (h) :o ;
! [.#.|#] Cns:* Vow j _ o: %^HMETA: %> h :o :o ;
[.#.|#] Cns:* Vow j _ :u (Dummy:) %> (h) :u ;
! [.#.|#] Cns:* Vow j _ u: (Dummy:) %> h :u :u ;
[.#.|#] Cns:* Vow j _ :y (Dummy:) %> (h) :y ;
! [.#.|#] Cns:* Vow j _ y: (Dummy:) %> h :y :y ;
[.#.|#] Cns:* Vow j _ :ä (Dummy:) %> (h) :ä ;
! [.#.|#] Cns:* Vow j _ ä: (Dummy:) %> h :ä :ä ;
[.#.|#] Cns:* Vow j _ :ö (Dummy:) %> (h) :ö ;
! [.#.|#] Cns:* Vow j _ ö: (Dummy:) %> h :ö :ö ;

"Gemination 0:k"
!! **RULE: @RULENAME@**
0:k <=> [.#.|#] Cns:* Vow k _ :a (Dummy:) %> (h) :a ; ! [:a|i2:|%^V:] ;
! [.#.|#] Cns:* Vow k _ a: (Dummy:) %> (h) :a :a ; ! [:a|i2:|%^V:] ;
[.#.|#] Cns:* Vow k _ :e (Dummy:) %> (h) :e ;
! [.#.|#] Cns:* Vow k _ e: (Dummy:) %> h :e :e ;
[.#.|#] Cns:* Vow k _ :i (Dummy:) %> (h) :i ;
! [.#.|#] Cns:* Vow k _ i: (Dummy:) %> h :i :i ;
[.#.|#] Cns:* Vow k _ o (Dummy:) %> (h) :o ;
! [.#.|#] Cns:* Vow k _ o: %^HMETA: %> h :o :o ;
[.#.|#] Cns:* Vow k _ :u (Dummy:) %> (h) :u ;
! [.#.|#] Cns:* Vow k _ u: (Dummy:) %> h :u :u ;
[.#.|#] Cns:* Vow k _ :y (Dummy:) %> (h) :y ;
! [.#.|#] Cns:* Vow k _ y: (Dummy:) %> h :y :y ;
[.#.|#] Cns:* Vow k _ :ä (Dummy:) %> (h) :ä ;
! [.#.|#] Cns:* Vow k _ ä: (Dummy:) %> h :ä :ä ;
[.#.|#] Cns:* Vow k _ :ö (Dummy:) %> (h) :ö ;
! [.#.|#] Cns:* Vow k _ ö: (Dummy:) %> h :ö :ö ;

!! **Tests:**

Expand All @@ -413,21 +395,14 @@ v:0 <=> Vow v _ Vow: [%^HMETA: |%^HMET2:] ;
"Gemination 0:l"
!! **RULE: @RULENAME@**
0:l <=> [.#.|#] Cns:* Vow l _ :a (Dummy:) %> (h) :a ; ! [:a|i2:|%^V:] ;
! [.#.|#] Cns:* Vow l _ a: (Dummy:) %> (h) :a :a ; ! [:a|i2:|%^V:] ;
[.#.|#] Cns:* Vow l _ :e (Dummy:) %> (h) :e ;
! [.#.|#] Cns:* Vow l _ e: (Dummy:) %> h :e :e ;
[.#.|#] Cns:* Vow l _ :i (Dummy:) %> (h) :i ;
[.#.|#] Cns:* Vow l _ i: (Dummy:) %> h :i :i ;
! [.#.|#] Cns:* Vow l _ i: (Dummy:) %> h :i :i ;
[.#.|#] Cns:* Vow l _ o (Dummy:) %> (h) :o ;
! [.#.|#] Cns:* Vow l _ o: %^HMETA: %> h :o :o ;
[.#.|#] Cns:* Vow l _ :u (Dummy:) %> (h) :u ;
! [.#.|#] Cns:* Vow l _ u: (Dummy:) %> h :u :u ;
[.#.|#] Cns:* Vow l _ :y (Dummy:) %> (h) :y ;
! [.#.|#] Cns:* Vow l _ y: (Dummy:) %> h :y :y ;
[.#.|#] Cns:* Vow l _ :ä (Dummy:) %> (h) :ä ;
! [.#.|#] Cns:* Vow l _ ä: (Dummy:) %> h :ä :ä ;
[.#.|#] Cns:* Vow l _ :ö (Dummy:) %> (h) :ö ;
! [.#.|#] Cns:* Vow l _ ö: (Dummy:) %> h :ö :ö ;

!! **Tests:**

Expand All @@ -437,78 +412,47 @@ v:0 <=> Vow v _ Vow: [%^HMETA: |%^HMET2:] ;
"Gemination 0:m"
!! **RULE: @RULENAME@**
0:m <=> [.#.|#] Cns:* Vow m _ :a (Dummy:) %> (h) :a ; ! [:a|i2:|%^V:] ;
! [.#.|#] Cns:* Vow m _ a: (Dummy:) %> (h) :a :a ; ! [:a|i2:|%^V:] ;
[.#.|#] Cns:* Vow m _ :e (Dummy:) %> (h) :e ;
! [.#.|#] Cns:* Vow m _ e: (Dummy:) %> h :e :e ;
[.#.|#] Cns:* Vow m _ :i (Dummy:) %> (h) :i ;
! [.#.|#] Cns:* Vow m _ i: (Dummy:) %> h :i :i ;
[.#.|#] Cns:* Vow m _ o (Dummy:) %> (h) :o ;
! [.#.|#] Cns:* Vow m _ o: %^HMETA: %> h :o :o ;
[.#.|#] Cns:* Vow m _ :u (Dummy:) %> (h) :u ;
! [.#.|#] Cns:* Vow m _ u: (Dummy:) %> h :u :u ;
[.#.|#] Cns:* Vow m _ :y (Dummy:) %> (h) :y ;
! [.#.|#] Cns:* Vow m _ y: (Dummy:) %> h :y :y ;
[.#.|#] Cns:* Vow m _ :ä (Dummy:) %> (h) :ä ;
! [.#.|#] Cns:* Vow m _ ä: (Dummy:) %> h :ä :ä ;
[.#.|#] Cns:* Vow m _ :ö (Dummy:) %> (h) :ö ;
! [.#.|#] Cns:* Vow m _ ö: (Dummy:) %> h :ö :ö ;

"Gemination 0:n"
!! **RULE: @RULENAME@**
0:n <=> [.#.|#] Cns:* Vow n _ :a (Dummy:) %> (h) :a ; ! [:a|i2:|%^V:] ;
! [.#.|#] Cns:* Vow n _ a: (Dummy:) %> (h) :a :a ; ! [:a|i2:|%^V:] ; !TESTAR TA BORT här på alla 0:Cns
[.#.|#] Cns:* Vow n _ :e (Dummy:) %> (h) :e ;
! [.#.|#] Cns:* Vow n _ e: (Dummy:) %> h :e :e ;
[.#.|#] Cns:* Vow n _ :i (Dummy:) %> (h) :i ;
! [.#.|#] Cns:* Vow n _ i: (Dummy:) %> h :i :i ;
[.#.|#] Cns:* Vow n _ o (Dummy:) %> (h) :o ;
! [.#.|#] Cns:* Vow n _ o: %^HMETA: %> h :o :o ;
[.#.|#] Cns:* Vow n _ :u (Dummy:) %> (h) :u ;
! [.#.|#] Cns:* Vow n _ u: (Dummy:) %> h :u :u ;
[.#.|#] Cns:* Vow n _ :y (Dummy:) %> (h) :y ;
! [.#.|#] Cns:* Vow n _ y: (Dummy:) %> h :y :y ;
[.#.|#] Cns:* Vow n _ :ä (Dummy:) %> (h) :ä ;
! [.#.|#] Cns:* Vow n _ ä: (Dummy:) %> h :ä :ä ;
[.#.|#] Cns:* Vow n _ :ö (Dummy:) %> (h) :ö ;
! [.#.|#] Cns:* Vow n _ ö: (Dummy:) %> h :ö :ö ;

"Gemination 0:p"
!! **RULE: @RULENAME@**
0:p <=> [.#.|#] Cns:* Vow p _ :a (Dummy:) %> (h) :a ; ! [:a|i2:|%^V:] ;
! [.#.|#] Cns:* Vow p _ a: (Dummy:) %> (h) :a :a ; ! [:a|i2:|%^V:] ;
[.#.|#] Cns:* Vow p _ :e (Dummy:) %> (h) :e ;
! [.#.|#] Cns:* Vow p _ e: (Dummy:) %> h :e :e ;
[.#.|#] Cns:* Vow p _ :i (Dummy:) %> (h) :i ;
! [.#.|#] Cns:* Vow p _ i: (Dummy:) %> h :i :i ;
[.#.|#] Cns:* Vow p _ o (Dummy:) %> (h) :o ;
! [.#.|#] Cns:* Vow p _ o: %^HMETA: %> h :o :o ;
[.#.|#] Cns:* Vow p _ :u (Dummy:) %> (h) :u ;
! [.#.|#] Cns:* Vow p _ u: (Dummy:) %> h :u :u ;
[.#.|#] Cns:* Vow p _ :y (Dummy:) %> (h) :y ;
! [.#.|#] Cns:* Vow p _ y: (Dummy:) %> h :y :y ;
[.#.|#] Cns:* Vow p _ :ä (Dummy:) %> (h) :ä ;
! [.#.|#] Cns:* Vow p _ ä: (Dummy:) %> h :ä :ä ;
[.#.|#] Cns:* Vow p _ :ö (Dummy:) %> (h) :ö ;
! [.#.|#] Cns:* Vow p _ ö: (Dummy:) %> h :ö :ö ;

"Gemination 0:s"
!! **RULE: @RULENAME@**
0:s <=> [.#.|#] Cns:* Vow s _ :a (Dummy:) %> (h) :a ; ! [:a|i2:|%^V:] ;
! [.#.|#] Cns:* Vow s _ a: (Dummy:) %> (h) :a :a ; ! [:a|i2:|%^V:] ;
[.#.|#] Cns:* Vow s _ :e (Dummy:) %> (h) :e ;
! [.#.|#] Cns:* Vow s _ e: (Dummy:) %> h :e :e ;
[.#.|#] Cns:* Vow s _ :i (Dummy:) %> (h) :i ;
! [.#.|#] Cns:* Vow s _ i: (Dummy:) %> h :i :i ;
[.#.|#] Cns:* Vow s _ o (Dummy:) %> (h) :o ;
! [.#.|#] Cns:* Vow s _ o: %^HMETA: %> h: :o :o ; ! issoon
[.#.|#] Cns:* Vow s _ :u (Dummy:) %> (h) :u ;
! [.#.|#] Cns:* Vow s _ u: (Dummy:) %> h :u :u ;
[.#.|#] Cns:* Vow s _ :y (Dummy:) %> (h) :y ;
! [.#.|#] Cns:* Vow s _ y: (Dummy:) %> h :y :y ;
[.#.|#] Cns:* Vow s _ :ä (Dummy:) %> (h) :ä ;
! [.#.|#] Cns:* Vow s _ ä: (Dummy:) %> h :ä :ä ;
[.#.|#] Cns:* Vow s _ :ö (Dummy:) %> (h) :ö ;
! [.#.|#] Cns:* Vow s _ ö: (Dummy:) %> h :ö :ö ;

!! **Tests:**

Expand Down Expand Up @@ -577,14 +521,7 @@ h:0 <=> Vow [p|t|k] _ e WeakGrade ;
[.#.|#] Cns:* Vow t _ :ä (Dummy:) %> :ä ;
[.#.|#] Cns:* Vow t _ :ö (Dummy:) %> :ö ;
[.#.|#] Cns:* Vow t _ a: (Dummy:) %> (h) :a :a ; ! [:a|i2:|%^V:] ;
! [.#.|#] Cns:* Vow t _ e: (Dummy:) %> h :e :e ;
! [.#.|#] Cns:* Vow t _ i: (Dummy:) %> h :i :i ;
[.#.|#] Cns:* Vow t _ o (Dummy:) %> (h) :o ;
! [.#.|#] Cns:* Vow t _ o: %^HMETA: %> h :o :o ;
! [.#.|#] Cns:* Vow t _ u: (Dummy:) %> h :u :u ;
! [.#.|#] Cns:* Vow t _ y: (Dummy:) %> h :y :y ;
! [.#.|#] Cns:* Vow t _ ä: (Dummy:) %> h :ä :ä ;
! [.#.|#] Cns:* Vow t _ ö: (Dummy:) %> h :ö :ö ;

!! **Tests:**

Expand All @@ -594,22 +531,13 @@ h:0 <=> Vow [p|t|k] _ e WeakGrade ;
"Gemination 0:v"
!! **RULE: @RULENAME@**
0:v <=> [.#.|#] Cns:* Vow v _ :a (Dummy:) %> (h) :a ; ! [:a|i2:|%^V:] ;
! [.#.|#] Cns:* Vow v _ a: (Dummy:) %> (h) [:a|:i] [:a|:i] ;
[.#.|#] Cns:* Vow v _ :e (Dummy:) %> (h) :e ;
! [.#.|#] Cns:* Vow v _ e: (Dummy:) %> h :e :e ;
[.#.|#] Cns:* Vow v _ :i (Dummy:) %> (h) :i ;
! [.#.|#] Cns:* Vow v _ i: (Dummy:) %> h :i :i ;
[.#.|#] Cns:* Vow v _ o (Dummy:) %> (h) :o ;
! [.#.|#] Cns:* Vow v _ o: %^HMETA: %> h :o :o ;
[.#.|#] Cns:* Vow v _ :u (Dummy:) %> (h) :u ;
! [.#.|#] Cns:* Vow v _ u: (Dummy:) %> h :u :u ;
[.#.|#] Cns:* Vow v _ :y (Dummy:) %> (h) :y ;
! [.#.|#] Cns:* Vow v _ y: (Dummy:) %> h :y :y ;
[.#.|#] Cns:* Vow v _ :ä (Dummy:) %> (h) :ä ;
! [.#.|#] Cns:* Vow v _ ä: (Dummy:) %> h :ä :ä ;
[.#.|#] Cns:* Vow v _ :ö (Dummy:) %> (h) :ö ;
! [.#.|#] Cns:* Vow v _ ö: (Dummy:) %> h :ö :ö ;

!! **Tests:**

!!€ kuv0a^HMETA>hiin
Expand Down
2 changes: 1 addition & 1 deletion src/fst/stems/adjectives.lexc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1816,7 +1816,7 @@ armas:arma aas ;
reipas:reippa aas ;
valpas:valppa aas ;
iltavalpas:iltavalppa aas ;
!paras:para aas ;
paras:para aas ;
vieras:viera aas ;
ventovieras:ventoviera aas ;
sairas:saira aas ;
Expand Down

0 comments on commit 7ea2dd2

Please sign in to comment.