From 5c0f1a3fc09ca66b1379f14d7e26469fd04f9687 Mon Sep 17 00:00:00 2001
From: aarne <aarne@cs.chalmers.se>
Date: Fri, 8 Jun 2007 15:30:21 +0000
Subject: [PATCH] restructured Russian; copies of Constructors in present and
 alltenses

---
 examples/logic/ArithmEng.gf              |  2 +-
 lib/resource-1.0/Makefile                |  9 +++++++++
 lib/resource-1.0/api/Constructors.gf     |  2 +-
 lib/resource-1.0/english/ParadigmsEng.gf |  4 ++--
 lib/resource-1.0/russian/LangRus.gf      | 23 ++++++++---------------
 5 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/examples/logic/ArithmEng.gf b/examples/logic/ArithmEng.gf
index 716350186..942b6d7c2 100644
--- a/examples/logic/ArithmEng.gf
+++ b/examples/logic/ArithmEng.gf
@@ -1,4 +1,4 @@
---# -path=.:mathematical:present:api:prelude
+--# -path=.:mathematical:present:prelude
 
 concrete ArithmEng of Arithm = LogicEng ** 
   open
diff --git a/lib/resource-1.0/Makefile b/lib/resource-1.0/Makefile
index c0b901a3b..6de4e3e38 100644
--- a/lib/resource-1.0/Makefile
+++ b/lib/resource-1.0/Makefile
@@ -12,6 +12,7 @@ GFC=$(GFCC) -src
 
 # comment the first and uncomment the second in Windows
 GFCP=$(GFC) -preproc=./mkPresent
+GFCCP=$(GFCC) -preproc=./mkPresent
 #GFCP=$(GFC) -preproc=mkPresent
 
 
@@ -42,6 +43,11 @@ alltenses:
 	$(GFC) swedish/Swedish.gf
 	$(GFC) common/ConstructX.gf
 	cp -p */*.gfc */*.gfr ../alltenses
+	touch api/Constructors.gf
+	$(GFCC) api/Constructors???.gf
+	cp -p api/Constructors*.gfc api/Constructors*.gfr ../alltenses
+
+
 
 langs:
 	echo "s ;; pm | wf langs.gfcm" | $(GFCA) -path=alltenses:prelude ../alltenses/Lang???.gfc $(RTSS)
@@ -66,6 +72,9 @@ present:
 	$(GFCP) swedish/Swedish.gf
 	$(GFCP) common/ConstructX.gf
 	mv */*.gfc */*.gfr ../present
+	touch api/Constructors.gf
+	$(GFCCP) api/Constructors???.gf
+	mv api/Constructors*.gfc api/Constructors*.gfr ../alltenses
 
 mathematical:
 	$(GFCC) mathematical/MathematicalEng.gf
diff --git a/lib/resource-1.0/api/Constructors.gf b/lib/resource-1.0/api/Constructors.gf
index e3ac49b87..d239ca299 100644
--- a/lib/resource-1.0/api/Constructors.gf
+++ b/lib/resource-1.0/api/Constructors.gf
@@ -12,7 +12,7 @@ incomplete resource Constructors = open Grammar in {
 --
 -- is written
 --
--- $mkS (mkCl (mkPN "John") (mkV2 "love") (mkPN "Mary"))$
+-- $mkS (mkCl (mkNP (mkPN "John")) (mkV2 "love") (mkNP (mkPN "Mary")))$
 --
 -- This module defines the syntactic constructors, which take trees as arguments.
 -- Lexical constructors, which take strings as arguments, are defined in the
diff --git a/lib/resource-1.0/english/ParadigmsEng.gf b/lib/resource-1.0/english/ParadigmsEng.gf
index c13dcdac0..ea90ac3e1 100644
--- a/lib/resource-1.0/english/ParadigmsEng.gf
+++ b/lib/resource-1.0/english/ParadigmsEng.gf
@@ -212,11 +212,11 @@ oper
 -- In practice, it is enough to give three forms, 
 -- e.g. "drink - drank - drunk".
 
-    mkV     : (drink, drank, drunk  : Str) -> V ;
+    mkV : (drink, drank, drunk  : Str) -> V ;
 
 -- Irregular verbs with duplicated consonant in the present participle.
  
-   mkV     : (run, ran, run, running  : Str) -> V ;
+    mkV : (run, ran, run, running  : Str) -> V ;
 
 -- Except for "be", the worst case needs five forms: the infinitive and
 -- the third person singular present, the past indicative, and the
diff --git a/lib/resource-1.0/russian/LangRus.gf b/lib/resource-1.0/russian/LangRus.gf
index a91740233..5beb1169a 100644
--- a/lib/resource-1.0/russian/LangRus.gf
+++ b/lib/resource-1.0/russian/LangRus.gf
@@ -1,17 +1,10 @@
---# -path=.:../abstract:../common:../../prelude
+--# -path=.:../abstract:../common:prelude
 
 concrete LangRus of Lang = 
-  NounRus, 
-  VerbRus, 
-  AdjectiveRus,
-  AdverbRus,
-  NumeralRus,
-  SentenceRus,
-  QuestionRus,
-  RelativeRus,
-  ConjunctionRus,
-  PhraseRus,
-  TextX,
-  StructuralRus,
-  IdiomRus,
-  LexiconRus ** { flags  startcat = Phr ; unlexer = text ; lexer = text ;} ;
+  GrammarRus,
+  LexiconRus
+  ** {
+
+flags startcat = Phr ; unlexer = text ; lexer = text ;
+
+} ;