From 3542a5260dacc670f55da7f1f235458ecaa8f5d5 Mon Sep 17 00:00:00 2001
From: Inari Listenmaa <inari.listenmaa@gmail.com>
Date: Fri, 21 Dec 2018 23:06:44 +0100
Subject: [PATCH] (Ara) Add new mkN constructor, for forcing a number in
 adjective

---
 src/arabic/ParadigmsAra.gf | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/arabic/ParadigmsAra.gf b/src/arabic/ParadigmsAra.gf
index 38a9f596..988e1928 100644
--- a/src/arabic/ParadigmsAra.gf
+++ b/src/arabic/ParadigmsAra.gf
@@ -80,6 +80,7 @@ resource ParadigmsAra = open
    mkN : N -> N -> N ;            -- Compound noun with singular genitive attribute, but inflects in state.
    mkN : Number -> N -> N -> N ;  -- Compound noun with genitive attribute, but inflects in state. Attribute's number specified by 1st arg.
    mkN : N -> A -> N ;            -- Force adjective modifier into the noun. Adjective inflects in state, case and number.
+   mkN : Number -> N -> A -> N ;            -- Force adjective modifier into the noun. Adjective inflects in state and case. Adjective's number specified by 1st arg.
    mkN : N -> AP -> N  ;          -- Force AP modifier into the noun. AP inflects in state, case and number.
 ---   mkN : (root,sgPatt : Str) -> Gender -> Species -> N                -- sound feminine plural
 ---    = sdfN ;
@@ -368,6 +369,8 @@ resource ParadigmsAra = open
      = attrN ;
    mkN : N -> A -> N
      = mkAN ;
+   mkN : Number -> N -> A -> N
+     = \num,n,a -> mkAPNumN n (A.PositA a) num ;
    mkN : N -> AP -> N
      = mkAPN
    } ;
@@ -385,6 +388,11 @@ resource ParadigmsAra = open
                    ++ ap.s ! n.h ! n.g ! num ! s ! c
     } ;
 
+  mkAPNumN : N -> AP -> Number -> N = \n,ap,forceNum -> n ** {
+    s2 = \\num,s,c => n.s2 ! num ! s ! c
+                   ++ ap.s ! Hum ! n.g ! forceNum ! s ! c
+    } ; -- Hum because we want to override the smartness in number agreement
+
   dualN : N -> N = \n -> n ** {isDual=True} ;
 
   proDrop : NP -> NP ; -- Force a NP to lose its string, only contributing with its agreement.