rules for constructing structural words (separate from Paradigms - is this desirable?)

2 files changed, 15 insertions, 3 deletions

diff --git a/next-lib/src/french/MakeStructuralFre.gf b/next-lib/src/french/MakeStructuralFre.gf
new file mode 100644
index 000000000..282e1c3e7
--- /dev/null
+++ b/next-lib/src/french/MakeStructuralFre.gf
@@ -0,0 +1,13 @@
+--# -path=.:../romance:../common:../abstract
+
+resource MakeStructuralFre = open CatFre, ParadigmsFre, MorphoFre, Prelude in {
+
+oper 
+  mkConj : Str -> Str -> Number -> Conj = \x,y,n -> 
+    {s1 = x ; s2 = y ; n = n ; lock_Conj = <>} ;
+  mkSubj : Str -> Subj = \x -> 
+    {s = x ; m = Indic ; lock_Subj = <>} ;
+  mkSubjSubj : Str -> Subj = \x -> 
+    {s = x ; m = Conjunct ; lock_Subj = <>} ;
+
+}
diff --git a/next-lib/src/french/StructuralFre.gf b/next-lib/src/french/StructuralFre.gf
index 4a0fa4981..133455612 100644
--- a/next-lib/src/french/StructuralFre.gf
+++ b/next-lib/src/french/StructuralFre.gf
@@ -163,9 +163,6 @@ lin
        Masc Pl P2 ;
 
   not_Predet = {s = \\a,c => prepCase c ++ "pas" ; c = Nom} ;
-  nothing_but_Predet = {s = \\a,c => prepCase c ++ "rien excepté" ; c = Nom} ;
-  nobody_but_Predet = {s = \\a,c => prepCase c ++ "personne excepté" ; c = Nom} ;
-
 
   no_Quant = 
     let aucun : ParadigmsFre.Number => ParadigmsFre.Gender => Case => Str = table {
@@ -184,5 +181,7 @@ lin
   at_least_AdN = ss "au moins" ;
   at_most_AdN = ss "au plus" ;
 
+  except_Prep = mkPreposition "excepté" ;
+
 }