documentation written; some weird constructors excluded from demo

resource/Make.hs

@@ -8,7 +8,8 @@ import System
 -- - OPT = (lang | api | math | pgf | test | demo | clean)
 -- - LANGS has the form e.g. langs=Eng,Fin,Rus
 -- - clone with a flag file=FILENAME clones the file to the specified languages,
---   by replacing the 3-letter language name of the original in both the filename and the body
+--   by replacing the 3-letter language name of the original in both 
+--   the filename and the body
 --   with each name in the list (default: all languages)
 -- With no argument, lang and api are done, in this order.
 -- See 'make' below for what is done by which command.
@@ -39,7 +40,7 @@ langsCoding = [
 langs = map fst langsCoding
 
 -- languagues for which to compile Lang
-langsLang = langs
+langsLang = langs `except` ["Ara"]
 
 -- languages for which to compile Try 
 langsAPI  = langsLang `except` ["Ara","Bul","Cat","Hin","Ina","Rus","Tha"]
@@ -114,7 +115,7 @@ mathstack = " +RTS -K100M"
 
 gf comm file = do
   putStrLn $ "reading " ++ file
-  system $ "echo \"" ++ comm ++ "\" | gf3 -s " ++ file
+  system $ "echo \"" ++ comm ++ "\" | gf -s " ++ file
 
 treeb abstr ls = "rf -lines -tree -file=" ++ treebankExx ++ 
         " | l -treebank " ++ unlexer abstr ls ++ " | wf -file=" ++ treebankResults

resource/catalan/DiffCat.gf

@@ -74,7 +74,10 @@ oper
           _ => <[],P2,False>
           }
        in case <paccp.p2, pdatp.p2> of {
-         <P3,P3> => <"se" ++ paccp.p1, [],True> ;
+         ---- AR 8/6/2008 efficiency problem in pgf generation: 
+         ---- replace the case expr with
+         ---- a constant produces an error in V3 predication with two pronouns
+         ---- <P3,P3> => <"se" ++ paccp.p1, [],True> ;
          _       => <pdatp.p1 ++ paccp.p1, [],orB paccp.p3 pdatp.p3>
          } ;
          

resource/catalan/LexiconCat.gf

@@ -353,5 +353,8 @@ lin
     wipe_V2 = dirV2 (verbV (pregar_86 "eixugar")) ;
     breathe_V = regV "respirar" ;
 --
+    john_PN = mkPN "Joan" masculine ;
+    today_Adv = mkAdv "hui" ;
+
 
 } ;

resource/demo/DemoBul.gf

@@ -1,10 +1,11 @@
 --# -path=.:alltenses
 
 concrete DemoBul of Demo = 
-  NounBul - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], 
+  NounBul - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,
+             ApposCN,MassNP,DetNP,ComplN3,Use2N3,Use3N3,AdvNP], 
 --  VerbBul, 
   ClauseBul, --
-  AdjectiveBul - [SentAP],
+  AdjectiveBul - [SentAP,ComplA2,UseA2,DemoA2],
   AdverbBul,
   NumeralBul,
 ----  SentenceBul,

resource/demo/DemoCat.gf

@@ -1,10 +1,11 @@
 --# -path=.:alltenses
 
 concrete DemoCat of Demo = 
-  NounCat - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], 
+  NounCat - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,
+             ApposCN,MassNP,DetNP,ComplN3,Use2N3,Use3N3,AdvNP], 
 --  VerbCat, 
   ClauseCat, --
-  AdjectiveCat - [SentAP],
+  AdjectiveCat - [SentAP,ComplA2,UseA2,DemoA2],
   AdverbCat,
   NumeralCat,
 ----  SentenceCat,

resource/demo/DemoDan.gf

@@ -1,10 +1,11 @@
 --# -path=.:alltenses
 
 concrete DemoDan of Demo = 
-  NounDan - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], 
+  NounDan - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,
+             ApposCN,MassNP,DetNP,ComplN3,Use2N3,Use3N3,AdvNP], 
 --  VerbDan, 
   ClauseDan, --
-  AdjectiveDan - [SentAP],
+  AdjectiveDan - [SentAP,ComplA2,UseA2,DemoA2],
   AdverbDan,
   NumeralDan,
 ----  SentenceDan,

resource/demo/DemoEng.gf

@@ -1,10 +1,11 @@
 --# -path=.:alltenses
 
 concrete DemoEng of Demo = 
-  NounEng - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], 
+  NounEng - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,
+             ApposCN,MassNP,DetNP,ComplN3,Use2N3,Use3N3,AdvNP], 
 --  VerbEng, 
   ClauseEng, --
-  AdjectiveEng - [SentAP],
+  AdjectiveEng - [SentAP,ComplA2,UseA2,DemoA2],
   AdverbEng,
   NumeralEng,
 ----  SentenceEng,

resource/demo/DemoFin.gf

@@ -1,10 +1,11 @@
 --# -path=.:alltenses
 
 concrete DemoFin of Demo = 
-  NounFin - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], 
+  NounFin - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,
+             ApposCN,MassNP,DetNP,ComplN3,Use2N3,Use3N3,AdvNP], 
 --  VerbFin, 
   ClauseFin, --
-  AdjectiveFin - [SentAP],
+  AdjectiveFin - [SentAP,ComplA2,UseA2,DemoA2],
   AdverbFin,
   NumeralFin,
 ----  SentenceFin,

resource/demo/DemoFre.gf

@@ -1,10 +1,11 @@
 --# -path=.:alltenses
 
 concrete DemoFre of Demo = 
-  NounFre - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], 
+  NounFre - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,
+             ApposCN,MassNP,DetNP,ComplN3,Use2N3,Use3N3,AdvNP], 
 --  VerbFre, 
   ClauseFre, --
-  AdjectiveFre - [SentAP],
+  AdjectiveFre - [SentAP,ComplA2,UseA2,DemoA2],
   AdverbFre,
   NumeralFre,
 ----  SentenceFre,

resource/demo/DemoGer.gf

@@ -1,10 +1,11 @@
 --# -path=.:alltenses
 
 concrete DemoGer of Demo = 
-  NounGer - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], 
+  NounGer - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,
+             ApposCN,MassNP,DetNP,ComplN3,Use2N3,Use3N3,AdvNP], 
 --  VerbGer, 
   ClauseGer, --
-  AdjectiveGer - [SentAP],
+  AdjectiveGer - [SentAP,ComplA2,UseA2,DemoA2],
   AdverbGer,
   NumeralGer,
 ----  SentenceGer,

resource/demo/DemoIta.gf

@@ -1,10 +1,11 @@
 --# -path=.:alltenses
 
 concrete DemoIta of Demo = 
-  NounIta - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], 
+  NounIta - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,
+             ApposCN,MassNP,DetNP,ComplN3,Use2N3,Use3N3,AdvNP], 
 --  VerbIta, 
   ClauseIta, --
-  AdjectiveIta - [SentAP],
+  AdjectiveIta - [SentAP,ComplA2,UseA2,DemoA2],
   AdverbIta,
   NumeralIta,
 ----  SentenceIta,

resource/demo/DemoNor.gf

@@ -1,10 +1,11 @@
 --# -path=.:alltenses
 
 concrete DemoNor of Demo = 
-  NounNor - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], 
+  NounNor - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,
+             ApposCN,MassNP,DetNP,ComplN3,Use2N3,Use3N3,AdvNP], 
 --  VerbNor, 
   ClauseNor, --
-  AdjectiveNor - [SentAP],
+  AdjectiveNor - [SentAP,ComplA2,UseA2,DemoA2],
   AdverbNor,
   NumeralNor,
 ----  SentenceNor,

resource/demo/DemoRus.gf

@@ -1,10 +1,11 @@
 --# -path=.:alltenses
 
 concrete DemoRus of Demo = 
-  NounRus - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], 
+  NounRus - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,
+             ApposCN,MassNP,DetNP,ComplN3,Use2N3,Use3N3,AdvNP], 
 --  VerbRus, 
   ClauseRus, --
-  AdjectiveRus - [SentAP],
+  AdjectiveRus - [SentAP,ComplA2,UseA2,DemoA2],
   AdverbRus,
   NumeralRus,
 ----  SentenceRus,
@@ -18,6 +19,6 @@ concrete DemoRus of Demo =
   LexiconRus
   ** {
 
-flags startcat = Phr ; unlexer = text ; lexer = text ; coding = utf8 ;
+flags startcat = Phr ; unlexer = text ; lexer = text ;
 
 } ;

resource/demo/DemoSpa.gf

@@ -1,10 +1,11 @@
 --# -path=.:alltenses
 
 concrete DemoSpa of Demo = 
-  NounSpa - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], 
+  NounSpa - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,
+             ApposCN,MassNP,DetNP,ComplN3,Use2N3,Use3N3,AdvNP], 
 --  VerbSpa, 
   ClauseSpa, --
-  AdjectiveSpa - [SentAP],
+  AdjectiveSpa - [SentAP,ComplA2,UseA2,DemoA2],
   AdverbSpa,
   NumeralSpa,
 ----  SentenceSpa,

resource/demo/DemoSwe.gf

@@ -1,10 +1,11 @@
 --# -path=.:alltenses
 
 concrete DemoSwe of Demo = 
-  NounSwe - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], 
+  NounSwe - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,
+             ApposCN,MassNP,DetNP,ComplN3,Use2N3,Use3N3,AdvNP], 
 --  VerbSwe, 
   ClauseSwe, --
-  AdjectiveSwe - [SentAP],
+  AdjectiveSwe - [SentAP,ComplA2,UseA2,DemoA2],
   AdverbSwe,
   NumeralSwe,
 ----  SentenceSwe,

resource/french/PhonoFre.gf

@@ -2,7 +2,7 @@ resource PhonoFre = open Prelude in {
 
 oper 
   voyelle : Strs = strs {
-    "a" ; "à" ; "â " ; "e" ; "é" ; "è" ; "ê¨" ; 
+    "a" ; "à" ; "â" ; "e" ; "é" ; "è" ; "ê¨" ; 
     "h" ; 
     "i" ; "î" ; "o" ; "ô" ; "u" ; "û" ; "y"
     } ;

resource/spanish/DiffSpa.gf

@@ -72,12 +72,13 @@ instance DiffSpa of DiffRomance = open CommonRomance, PhonoSpa, BeschSpa, Prelud
           } ;
         defaultPronArg = <pdatp.p1 ++ paccp.p1, [], orB paccp.p3 pdatp.p3>
       in 
-        case <<paccp.p2, pdatp.p2> : Person * Person> of {
+      ----  case <<paccp.p2, pdatp.p2> : Person * Person> of {
-           <P3,P3> => <"se" ++ paccp.p1, [], True> ;
+      ----     <P3,P3> => <"se" ++ paccp.p1, [], True> ;
-           _ => defaultPronArg
+      ----     _ => defaultPronArg
-           } ;
+      ---     } ;
       ---- 8/6/2008 efficiency problem in pgf generation: replace the case expr with
-      ---- defaultPronArg ;
+      ---- a constant produces an error in V3 predication with two pronouns
+         defaultPronArg ;
 
     mkImperative b p vp = {
       s = \\pol,aag => 

resource/spanish/LexiconSpa.gf

@@ -348,6 +348,9 @@ lin
   wipe_V2 = dirV2 (regV "secar") ;
     breathe_V = (regV "respirar") ;
 
+  john_PN = mkPN "Juan" masculine ;
+  today_Adv = mkAdv "hoy" ;
+
   grammar_N = regN "gramática" ;
   language_N = regN "lengua" ;
   rule_N = regN "regla" ;