From 95b04d53bb9021e7fd917e66fcfd8546f1678b66 Mon Sep 17 00:00:00 2001
From: aarne <unknown>
Date: Thu, 13 Oct 2005 12:43:47 +0000
Subject: [PATCH] make resource

---
 lib/resource/Makefile                     |  2 ++
 lib/resource/MkResource.gfs               | 12 ++++++++++++
 lib/resource/finnish/BasicFin.gf          |  2 +-
 lib/resource/french/VerbphraseFre.gf      |  2 +-
 lib/resource/romance/SyntaxRomanceVP.gf   |  2 +-
 lib/resource/romance/VerbphraseRomance.gf |  8 ++++----
 src/GF/Shell/ShellCommands.hs             |  6 +++---
 7 files changed, 24 insertions(+), 10 deletions(-)
 create mode 100644 lib/resource/Makefile
 create mode 100644 lib/resource/MkResource.gfs

diff --git a/lib/resource/Makefile b/lib/resource/Makefile
new file mode 100644
index 000000000..14023dcc2
--- /dev/null
+++ b/lib/resource/Makefile
@@ -0,0 +1,2 @@
+all:
+	gf  -src +RTS -K10M <MkResource.gfs
diff --git a/lib/resource/MkResource.gfs b/lib/resource/MkResource.gfs
new file mode 100644
index 000000000..30525b663
--- /dev/null
+++ b/lib/resource/MkResource.gfs
@@ -0,0 +1,12 @@
+i finnish/LangFin.gf 
+s
+i french/LangFre.gf 
+i italian/LangIta.gf 
+i spanish/LangSpa.gf 
+s
+i norwegian/LangNor.gf 
+i swedish/LangSwe.gf 
+s
+i english/LangEng.gf
+s
+pm | wf langs.gfcm
diff --git a/lib/resource/finnish/BasicFin.gf b/lib/resource/finnish/BasicFin.gf
index 41a4bea98..25563504b 100644
--- a/lib/resource/finnish/BasicFin.gf
+++ b/lib/resource/finnish/BasicFin.gf
@@ -122,7 +122,7 @@ lin
   love_V2 = caseV2 (regV "rakastaa") partitive ;
   man_N = mkN "mies" "miehen" "miehenä" "miestä" "mieheen" 
             "miehinä" "miehissä" "miesten" "miehiä" "miehiin" human ;
-  married_A2 = mkA2 (mkA (regN "avioitunut")) (postpP genitive "kanssa") ;
+  married_A2 = mkA2 (mkA (nRae "avioitunut" "avioituneena")) (postpP genitive "kanssa") ;
   meat_N = nLukko "liha" ;
   milk_N = nLukko "maito" ;
   moon_N = regN "kuu" ;
diff --git a/lib/resource/french/VerbphraseFre.gf b/lib/resource/french/VerbphraseFre.gf
index 93ddbdc25..a21f9ab1e 100644
--- a/lib/resource/french/VerbphraseFre.gf
+++ b/lib/resource/french/VerbphraseFre.gf
@@ -1,3 +1,3 @@
 --# -path=.:../romance:../abstract:../../prelude
 concrete VerbphraseFre of Verbphrase = CategoriesFre **
-  VerbphraseRomance with (SyntaxScand=SyntaxFre) ;
+  VerbphraseRomance with (SyntaxRomanceVP=SyntaxFreVP) ;
diff --git a/lib/resource/romance/SyntaxRomanceVP.gf b/lib/resource/romance/SyntaxRomanceVP.gf
index 2b87e8cf7..771ae89af 100644
--- a/lib/resource/romance/SyntaxRomanceVP.gf
+++ b/lib/resource/romance/SyntaxRomanceVP.gf
@@ -10,7 +10,7 @@
 --
 -- The following files are presupposed:
 
-interface SyntaxRomance = TypesRomance ** open Prelude, (CO=Coordination) in {
+interface SyntaxRomanceVP = TypesRomance ** open Prelude, (CO=Coordination) in {
 
 --2 Common Nouns
 --
diff --git a/lib/resource/romance/VerbphraseRomance.gf b/lib/resource/romance/VerbphraseRomance.gf
index 5a1024d56..7f3c8ef75 100644
--- a/lib/resource/romance/VerbphraseRomance.gf
+++ b/lib/resource/romance/VerbphraseRomance.gf
@@ -20,9 +20,9 @@
 -- implemented. The parameter types are defined in $TypesEng.gf$.
 
 incomplete concrete VerbphraseRomance of Verbphrase = CategoriesRomance ** 
-  open Prelude, SyntaxRomance in {
+  open Prelude, SyntaxRomanceVP in {
 
-  flags optimize=all ;
+  flags optimize=all_subs ;
 
   lin
   UseV v = predClauseGroup v (complVerb v) ;
@@ -54,8 +54,8 @@ incomplete concrete VerbphraseRomance of Verbphrase = CategoriesRomance **
   RelVP = relVerbPhrase ;
   IntVP = intVerbPhrase ;
 
-  PosVP tp = predVerbGroup True tp ;
-  NegVP tp = predVerbGroup False tp ;
+--  PosVP tp = predVerbGroup True tp ;
+--  NegVP tp = predVerbGroup False tp ;
 
   AdvVP = adVerbPhrase ;
   SubjVP = subjunctVerbPhrase ;
diff --git a/src/GF/Shell/ShellCommands.hs b/src/GF/Shell/ShellCommands.hs
index 08996fb5c..fefc9a821 100644
--- a/src/GF/Shell/ShellCommands.hs
+++ b/src/GF/Shell/ShellCommands.hs
@@ -5,9 +5,9 @@
 -- Stability   : (stable)
 -- Portability : (portable)
 --
--- > CVS $Date: 2005/10/12 12:38:30 $ 
+-- > CVS $Date: 2005/10/13 13:43:47 $ 
 -- > CVS $Author: aarne $
--- > CVS $Revision: 1.42 $
+-- > CVS $Revision: 1.43 $
 --
 -- The datatype of shell commands and the list of their options.
 -----------------------------------------------------------------------------
@@ -176,7 +176,7 @@ optionsOfCommand co = case co of
   CParse -> both "new newer cfg mcfg n ign raw v lines all" "cat lang lexer parser number rawtrees"
   CTranslate _ _ -> opts "cat lexer parser"
   CGenerateRandom -> flags "cat lang number depth"
-  CGenerateTrees -> both "metas one" "depth alts cat lang number"
+  CGenerateTrees -> both "metas" "atoms depth alts cat lang number"
   CPutTerm -> flags "transform number"
   CWrapTerm _ -> opts "c"
   CMorphoAnalyse -> both "short" "lang"