copy files over from GF-latin

src/latin/StructuralLat.gf

@@ -1,5 +1,5 @@
-concrete StructuralLat of Structural = CatLat ** 
-  open ResLat, ParadigmsLat, Prelude, IrregLat, ConstructX in 
+concrete StructuralLat of Structural = CatLat **  
+  open ResLat, ParadigmsLat, Prelude, IrregLat, (C=ConstructX) in 
   {
     
   flags optimize=all ;
@@ -11,68 +11,68 @@ concrete StructuralLat of Structural = CatLat **
   almost_AdA, almost_AdN = ss "quasi" ; -- L...
   although_Subj = ss "quamquam" ; -- L...
   always_AdV = ss "semper" ; -- L...
-  and_Conj = sd2 [] "et" ** {n = Pl} ; -- L...
+  and_Conj = mkConj [] "et" Pl And ; -- L...
 -----b  and_Conj = ss "and" ** {n = Pl} ;
   because_Subj = ss "cum" ; -- L...
   before_Prep = mkPrep "ante" Acc ; -- acc. L...
   behind_Prep = mkPrep "a tergo" Acc ; -- acc. L...
   between_Prep = mkPrep "inter" Acc ; -- acc. L...
-  both7and_DConj = sd2 "et" "et" ** {n = Pl} ; --L...
+  both7and_DConj = mkConj "et" "et" Pl And; --L...
   but_PConj = ss "sed" ; -- L...
   by8agent_Prep = mkPrep "per" Abl ; -- L...
-  by8means_Prep = Abl_Prep ; -- L...
-  can8know_VV, can_VV = IrregLat.can_VV ; --L...
+  by8means_Prep = mkPrep "" Abl ; -- L...
+  can8know_VV, can_VV = mkVV IrregLat.can_V True ; --L...
   during_Prep = mkPrep "inter" Acc ; -- L...
-  either7or_DConj = sd2 "aut" "aut" ** {n = Sg} ; -- L...
-  everybody_NP = regNP  "quisque" "quemque" "cuiusque" "cuique" "quoque" "quisque" ( Masc | Fem ) Sg ;-- regNP "quisquae" Sg ; -- L...
+  either7or_DConj = mkConj "aut" "aut" Sg Or ; -- L...
+  everybody_NP = regNP  "quisque" "quemque" "cuiusque" "cuique" "quoque" "quisque" Masc Sg ;-- regNP "quisquae" Sg ; -- L...
   every_Det = mkDeterminer ( mkA "omnis" ) Pl ; -- Pons
   everything_NP = regNP "omnia" "omnia" "omnium" "omnis" "omnis" "omnia" Neutr Pl ; --regNP "omnia" Pl ; -- L...
-  everywhere_Adv = ss "ubique" ; -- L...
+  everywhere_Adv = mkAdv  "ubique" ; -- L...
   few_Det = mkDeterminer ( mkA "paulus" ) Pl ; -- L...
 -----  first_Ord = ss "first" ; DEPRECATED
   for_Prep = mkPrep "pro" Abl ; -- abl. L...
   from_Prep = mkPrep "de" Abl ; -- abl. L...
   he_Pron = mkPronoun Masc Sg P3 ;
-  here_Adv = ss "hic" ; -- L...
-  here7to_Adv = ss "huc" ; -- L...
-  here7from_Adv = ss "hinc" ; -- L...
+  here_Adv = mkAdv  "hic" ; -- L...
+  here7to_Adv = mkAdv  "huc" ; -- L...
+  here7from_Adv = mkAdv  "hinc" ; -- L...
   how_IAdv = ss "qui" ; -- L...
   how8many_IDet = mkDeterminer (mkA "quantus" ) Pl ; -- Pons
   how8much_IAdv = ss "quantum" ; -- L...
   if_Subj = ss "si" ; -- L...
   in8front_Prep = mkPrep "ante" Acc ; -- acc. L...
   i_Pron = mkPronoun Masc Sg P1 ;
-  in_Prep = mkPrep "in" ( variants { Abl ; Acc } ) ; -- L...
+  in_Prep = mkPrep "in" Acc ; -- L..., abl. in extra
   it_Pron = mkPronoun Neutr Sg P3 ; 
-  less_CAdv = mkCAdv "minus" "quam" ; -- L...
+  less_CAdv = C.mkCAdv "minus" "quam" ; -- L...
   many_Det = mkDeterminer ( mkA "multus" ) Pl ; -- L...
-  more_CAdv = mkCAdv "magis" "quam" ; -- L...
+  more_CAdv = C.mkCAdv "magis" "quam" ; -- L...
   most_Predet = ss "plurimi" ; -- L...
   much_Det = mkDeterminer ( mkA "multus" ) Sg ; -- L...
   must_VV = mkVV ( mkV "debere" ) True ; -- L...
 -----b  no_Phr = ss "immo" ;
   no_Utt = ss "non est" ; -- should be expressed by a short negated sentence L...
-  on_Prep = mkPrep "in" ( Acc | Abl ) ; -- L...
+  on_Prep = mkPrep "in" Acc ; -- L...
 ------  one_Quant = mkDeterminer Sg "one" ; -- DEPRECATED
   only_Predet = ss "solum" ; -- L...
-  or_Conj = sd2 [] "aut" ** {n = Sg} ; -- L...
+  or_Conj = mkConj [] "aut" Sg Or ; -- L...
   otherwise_PConj = ss "praeterea" ; -- Pons
   part_Prep = mkPrep [] Gen ; -- Bayer-Lindauer 127
   please_Voc = ss "queso" ; -- L...
   possess_Prep = mkPrep [] Gen ; -- Bayer-Lindauer 125.2
-  quite_Adv = ss "admodum" ; -- or by comparation L...
+  quite_Adv = ss "admodum" ; -- actually AdA, can be expressed by comparation L...
   she_Pron = mkPronoun Fem Sg P3 ;
   so_AdA = ss "sic" ; -- L...
-  somebody_NP = regNP "aliquis" "aliquem" "alicuius" "clicui" "aliquo" "aliquis" ( Masc | Fem ) Sg ; -- Bayer-Lindauer 60.1
+  somebody_NP = regNP "aliquis" "aliquem" "alicuius" "clicui" "aliquo" "aliquis" Masc Sg ; -- Bayer-Lindauer 60.1
   someSg_Det = mkDeterminer ( mkA "aliquis" ) Sg ; -- L...
   somePl_Det = mkDeterminer ( mkA "nonnullus" ) Pl ; --L ...
   something_NP = regNP "aliquid" "aliquid" "alicuius rei" "alicui rei" "aliqua re" "aliquid" Masc Sg ; -- Bayer-Lindauer 60.1
-  somewhere_Adv = ss "usquam" ; -- L...
+  somewhere_Adv = mkAdv  "usquam" ; -- L...
   that_Quant = ille_Quantifier ;
   that_Subj = ss "ut" ; -- L...
-  there_Adv = ss "ibi" ; -- loc. L...
-  there7to_Adv = ss "eo" ; -- Pons
-  there7from_Adv = ss "inde" ; -- Pons
+  there_Adv = mkAdv  "ibi" ; -- loc. L...
+  there7to_Adv = mkAdv  "eo" ; -- Pons
+  there7from_Adv = mkAdv  "inde" ; -- Pons
   therefore_PConj = ss "ergo" ; -- L...
   they_Pron = mkPronoun Masc Pl P3 ;
   this_Quant = hic_Quantifier ;
@@ -109,18 +109,18 @@ concrete StructuralLat of Structural = CatLat **
   yes_Utt = ss "sane" ; -- L...
   youSg_Pron = mkPronoun Masc Sg P2 ;
   youPl_Pron = mkPronoun Masc Pl P2 ;
-  youPol_Pron = youSg_Pron | youPl_Pron ;
+  youPol_Pron = youSg_Pron ; -- only use singular
 
   no_Quant = { s , sp = ( mkA "nullus" ).s ! Posit } ; -- nullus L... 
   not_Predet = ss "non" ; -- L...
-  if_then_Conj = {s1 = "si" ; s2 = "" ; n = Sg } ; -- no word in s2 field L... 
+  if_then_Conj = mkConj "si" [] Sg If ; -- no word in s2 field L... 
   at_least_AdN = ss "saltem" ; -- L...
   at_most_AdN = ss "summum" ; -- Pons
-  nobody_NP = regNP "nemo" "neminem" "neminis" "nemini" "nemine" "nemo" ( Masc | Fem ) Sg ; -- Bayer Lindauer 60.4
+  nobody_NP = regNP "nemo" "neminem" "neminis" "nemini" "nemine" "nemo" Masc Sg ; -- Bayer Lindauer 60.4
   nothing_NP = regNP "nihil" "nihil" "nullius rei" "nulli rei" "nulla re" "nihil" Neutr Sg ; -- Bayer-Lindauer 60.4
   except_Prep = mkPrep "praeter" Acc ; -- L...
 
-  as_CAdv = mkCAdv "ita" "ut" ; -- L ...
+  as_CAdv = C.mkCAdv "ita" "ut" ; -- L ...
 
   have_V2 = mkV2 (mkV "habere") ; -- habeo, -ui, -itum 2 (Langenscheidts)