From 7ea2dd2dfff1eca2e6fac69d46f9c85d52081b48 Mon Sep 17 00:00:00 2001 From: Lina Lejdebro Date: Fri, 8 Dec 2023 15:53:18 +0000 Subject: [PATCH] =?UTF-8?q?St=C3=A4dat=20bort=20utkommenterat,=20mindre=20?= =?UTF-8?q?=C3=A4ndring=20av=20a1-affix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/fst/affixes/adjectives.lexc | 3 +- src/fst/affixes/pronouns.lexc | 4 +- src/fst/phonology.twolc | 74 +-------------------------------- src/fst/stems/adjectives.lexc | 2 +- 4 files changed, 6 insertions(+), 77 deletions(-) diff --git a/src/fst/affixes/adjectives.lexc b/src/fst/affixes/adjectives.lexc index 47790dcc..79fe7bd9 100644 --- a/src/fst/affixes/adjectives.lexc +++ b/src/fst/affixes/adjectives.lexc @@ -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 diff --git a/src/fst/affixes/pronouns.lexc b/src/fst/affixes/pronouns.lexc index 3fe6dae4..7e371414 100644 --- a/src/fst/affixes/pronouns.lexc +++ b/src/fst/affixes/pronouns.lexc @@ -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 ; diff --git a/src/fst/phonology.twolc b/src/fst/phonology.twolc index 951879fe..a0f86340 100644 --- a/src/fst/phonology.twolc +++ b/src/fst/phonology.twolc @@ -173,8 +173,6 @@ n:0 <=> Vow n _ Vow: [%^HMETA: |%^HMET2:] ; - - !! **p rules** "p:0" @@ -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:** @@ -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:** @@ -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:** @@ -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:** @@ -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 diff --git a/src/fst/stems/adjectives.lexc b/src/fst/stems/adjectives.lexc index 9ccc4b64..8e876ca0 100644 --- a/src/fst/stems/adjectives.lexc +++ b/src/fst/stems/adjectives.lexc @@ -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 ;