From f939bc25244a4faa65d71e9f70a3b7e5a9e6f95c Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Tue, 2 Jun 2015 09:45:44 +0000
Subject: [PATCH] French input grammar FreInput separated from Fre

---
 examples/app/AppFreInput.gf | 9 +++++++--
 examples/app/Makefile       | 3 ++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/examples/app/AppFreInput.gf b/examples/app/AppFreInput.gf
index 884d1c01f..d0c95fe90 100644
--- a/examples/app/AppFreInput.gf
+++ b/examples/app/AppFreInput.gf
@@ -1,6 +1,6 @@
 --# -path=.:../../lib/src/chunk:../../lib/src/translator:../phrasebook/gfos
 
-concrete AppFre of App = 
+concrete AppFreInput of App = 
 {-
   TranslateFre - [
 ----    SlashVP, SlashVS, ---- expensive functions in Fre
@@ -24,8 +24,13 @@ concrete AppFre of App =
 -}
   NounFre - [PPartNP],
   AdjectiveFre,
-  VerbFre [UseV,CompAP,CompAdv,UseComp,AdvVP],
+  VerbFre [UseV,CompAP,CompAdv,UseComp,AdvVP,SlashV2a,ComplSlash],
   SentenceFre [PredVP,UseCl],
+  QuestionFre - [QuestCl,QuestIAdv,ComplSlashIP,AdvQVP,AddAdvQVP,QuestQVP],
+  ConjunctionFre,
+  ConstructionFre,
+  TranslateFre [QuestCl,QuestIAdv],
+  IdiomFre - [CleftNP, CleftAdv,ImpP3],
   TenseFre,
   PhraseFre,
   AdverbFre,
diff --git a/examples/app/Makefile b/examples/app/Makefile
index 26023d7ce..f1927718e 100644
--- a/examples/app/Makefile
+++ b/examples/app/Makefile
@@ -14,7 +14,7 @@ GFMKT=mkdir -p $(GFODIR) && gf $S -make -literal=PN,Symb -probs=$(PROBSFILE) -gf
 APP11=AppEng.pgf AppBul.pgf AppChi.pgf AppGer.pgf AppSwe.pgf AppHin.pgf AppFin.pgf AppFre.pgf AppIta.pgf AppSpa.pgf AppDut.pgf
 APP12=$(APP11) AppCat.pgf
 APP13=$(APP12) AppJpn.pgf
-APP14=$(APP13) AppTha.pgf
+APP14=$(APP13) AppTha.pgf AppFreInput.pgf
 
 # With dependencies:
 App11.pgf: $(APP11)
@@ -46,6 +46,7 @@ AppFin.pgf:: ; $(GFMKT) -name=AppFin AppFin.gf +RTS -K64M
 AppGer.pgf:: ; $(GFMKT) -name=AppGer AppGer.gf +RTS -K64M
 AppHin.pgf:: ; $(GFMKT) -name=AppHin AppHin.gf
 AppFre.pgf:: ; $(GFMKT) -name=AppFre AppFre.gf +RTS -K64M
+AppFreInput.pgf:: ; $(GFMKT) -name=AppFreInput AppFreInput.gf +RTS -K64M
 AppIta.pgf:: ; $(GFMKT) -name=AppIta AppIta.gf +RTS -K64M
 AppJpn.pgf:: ; $(GFMKT) -name=AppJpn AppJpn.gf +RTS -K64M
 AppSpa.pgf:: ; $(GFMKT) -name=AppSpa AppSpa.gf +RTS -K64M