diff --git a/lib/src/Make.hs b/lib/src/Make.hs index 8cbd1e924..31cfb2d49 100644 --- a/lib/src/Make.hs +++ b/lib/src/Make.hs @@ -117,10 +117,12 @@ make xx = do let pres | elem "present" xx = 1 | elem "alltenses" xx = 2 + | elem "newcomp" xx = 3 | otherwise = 0 let dir = case pres of 1 -> "../present" 2 -> "../alltenses" + 3 -> "../newcomp" _ -> "../full" let optl ls = maybe ls id $ getOptLangs xx @@ -173,9 +175,10 @@ gfc pres ppath file = do let preproc = if (pres==1) then "-preproc=mkPresent" else "" let path = if (pres==1) then ppath else "" putStrLn $ "Compiling " ++ file - if pres == 0 - then run_gfc ["-s","-src",preproc, path, file] - else run_gfc ["-s","-src","-no-pmcfg",preproc, path, file] + case pres of + 0 -> run_gfc ["-s","-src",preproc, path, file] + 3 -> run_gfc ["-s","-src","-no-pmcfg", "-new-comp", preproc, path, file] + _ -> run_gfc ["-s","-src","-no-pmcfg",preproc, path, file] gfcmin path file = do diff --git a/lib/src/italian/ParadigmsIta.gf b/lib/src/italian/ParadigmsIta.gf index 9bb17daa9..13349c504 100644 --- a/lib/src/italian/ParadigmsIta.gf +++ b/lib/src/italian/ParadigmsIta.gf @@ -62,6 +62,9 @@ oper genitive : Prep ; -- preposition "di" and its contractions dative : Prep ; -- preposition "a" and its contractions + di_Prep : Prep ; -- = genitive + a_Prep : Prep ; -- = dative + -- The following prepositions also have special contracted forms. con_Prep : Prep ; -- preposition "con" and its contractions @@ -298,8 +301,8 @@ oper --Prep = Compl ; accusative = lin Prep complAcc ; - genitive = lin Prep complGen ; - dative = lin Prep complDat ; + genitive, di_Prep = lin Prep complGen ; + dative, a_Prep = lin Prep complDat ; mkPrep p = lin Prep {s = p ; c = Acc ; isDir = False ; lock_Prep = <>} ; con_Prep = {s = [] ; c = CPrep P_con ; isDir = False ; lock_Prep = <>} ;