From 002fea0e66b0403621dc68ad0834a7f35dc4dc9f Mon Sep 17 00:00:00 2001 From: Inari Listenmaa Date: Wed, 9 Jan 2019 13:51:06 +0200 Subject: [PATCH] (Ara) Add new mkV2V constructors + better comments for degrA --- src/arabic/ParadigmsAra.gf | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/arabic/ParadigmsAra.gf b/src/arabic/ParadigmsAra.gf index 490a503ca..6e1110aea 100644 --- a/src/arabic/ParadigmsAra.gf +++ b/src/arabic/ParadigmsAra.gf @@ -159,7 +159,7 @@ resource ParadigmsAra = open idaafaA : N -> A -> A ; -- first argument will be in constructus but inflect in case, adjective in genitive, but inflect in gender, number and definiteness. e.g. غَيْرُ طَيِّبٍ - degrA : (posit,compar,plur : Str) -> A ; + degrA : (masc,fem,plur : Str) -> A ; -- adjective where masculine singular is also the comparative form. irregFemA : (masc : A) -> (fem : A) -> A ; -- adjective with irregular feminine. Takes two adjectives (masc. "regular" and fem. "regular") and puts them together. @@ -531,7 +531,7 @@ resource ParadigmsAra = open let { fcl = mkRoot3 rootStr ; verb : Verb = case rootStr of { - f@? + c@? + "ّ" => v8geminate (f+c+c) ; + f@? + c@? + "ّ" => v8geminate (f+c+c) ; #weak + ? + ? => v8assimilated fcl ; ? + #weak + ? => v8hollow fcl ; _ => v8sound fcl } @@ -669,8 +669,8 @@ resource ParadigmsAra = open AComp d c => rectifyHmz (indeclN akbar ! d ! c) } } ; - degrA : (posit,compar,plur : Str) -> A - = \posit,compar,plur -> lin A {s = clr posit compar plur} ; + degrA : (masc,fem,plur : Str) -> A + = \masc,fem,plur -> lin A {s = clr masc fem plur} ; idaafaA : N -> A -> A = \ghayr,tayyib -> tayyib ** { s = table { @@ -777,6 +777,12 @@ resource ParadigmsAra = open mkV2V = overload { mkV2V : V -> Str -> Str -> V2V = \v,p,q -> lin V2V (prepV3 v (mkPreposition p) (mkPreposition q) ** {sc = noPrep}) ; + mkV2V : V2 -> V2V = \v2 -> + lin V2V (v2 ** {c2 = v2.c2 ; c3,sc = noPrep}) ; + mkV2V : V2 -> Preposition -> V2V = \v2,p -> + lin V2V (v2 ** {c2 = v2.c2 ; c3 = p ; sc = noPrep}) ; + mkV2V : V2 -> Preposition -> Preposition -> V2V = \v2,p,q-> + lin V2V (v2 ** {c2 = v2.c2 ; c3 = p ; sc = q}) ; mkV2V : V -> Preposition -> Preposition -> V2V = \v,p,q -> lin V2V (prepV3 v p q ** {sc = noPrep}) ; mkV2V : VV -> Preposition -> V2V = \vv,p ->