a new abstract syntax in Documentation.gf which allows a more compact definition of the corresponding concrete syntax. The new strategy is so far used only in DocumentationEng and the new DocumentationBul.

2014-02-17 08:45:57 +00:00
parent 769fd9af69
commit a6747eac6b
10 changed files with 444 additions and 212 deletions
--- a/lib/src/bulgarian/DocumentationBul.gf
+++ b/lib/src/bulgarian/DocumentationBul.gf
@@ -0,0 +1,375 @@
+--# -path=.:../abstract:../common
+concrete DocumentationBul of Documentation = CatBul ** open 
+  ResBul,
+  SyntaxBul,
+  HTML in {
+
+lincat
+  Inflection = {s1,s2,s3 : Str} ;
+  Document   = {s : Str} ;
+
+lin
+  InflectionN n = {
+    s1= heading1 ("Съществително"++
+                  case n.g of {
+                    AMasc Human    => "(м.р.л.)" ;
+                    AMasc NonHuman => "(м.р.)" ;
+                    AFem           => "(ж.р.)" ;
+                    ANeut          => "(ср.р.)"
+                  }) ;
+    s2= frameTable (
+          tr (intagAttr "th" "rowspan=\"3\"" "ед.ч." ++ 
+              th "нечленувано" ++ td (n.s ! (NF Sg Indef))) ++
+          tr (th "членувано" ++ td (n.s ! (NF Sg Def))) ++
+          tr (th "пълен член" ++ td (n.s ! NFSgDefNom)) ++
+          tr (intagAttr "th" "rowspan=\"2\"" "мн.ч." ++ 
+              th "нечленувано" ++ td (n.s ! (NF Pl Indef))) ++
+          tr (th "членувано" ++ td (n.s ! (NF Pl Def))) ++
+          tr (intagAttr "th" "colspan=\"2\"" "звателна форма" ++ td (n.s ! NFVocative)) ++
+          tr (intagAttr "th" "colspan=\"2\"" "бройна форма" ++ td (n.s ! NFPlCount))
+        ) ;
+    s3= heading1 ("Прилагателно") ++
+        frameTable (
+          tr (intagAttr "th" "rowspan=\"7\"" "ед.ч." ++ 
+              intagAttr "th" "rowspan=\"3\"" "мн.ч." ++ 
+              th "нечленувано" ++ 
+              td (n.rel ! (ASg Masc Indef))) ++
+          tr (th "непълен член" ++ td (n.rel ! (ASg Masc Def))) ++
+          tr (th "пълен член" ++ td (n.rel ! ASgMascDefNom)) ++
+          tr (intagAttr "th" "rowspan=\"2\"" "ж.р." ++
+              th "нечленувано" ++ td (n.rel ! (ASg Fem Indef))) ++
+          tr (th "членувано" ++ td (n.rel ! (ASg Fem Def))) ++
+          tr (intagAttr "th" "rowspan=\"2\"" "ср.р." ++
+              th "нечленувано" ++ td (n.rel ! (ASg Neut Indef))) ++
+          tr (th "членувано" ++ td (n.rel ! (ASg Neut Def))) ++
+          tr (intagAttr "th" "colspan=\"2\" rowspan=\"2\"" "мн.ч." ++
+              th "нечленувано" ++ td (n.rel ! (APl Indef))) ++
+          tr (th "членувано" ++ td (n.rel ! (APl Def)))
+        )
+  } ;
+
+  InflectionN2,InflectionN3 = \n -> {
+    s1= heading1 ("Съществително "++
+                  case n.g of {
+                    AMasc Human    => "(м.р.л.)" ;
+                    AMasc NonHuman => "(м.р.)" ;
+                    AFem           => "(ж.р.)" ;
+                    ANeut          => "(ср.р.)"
+                  }) ;
+    s2= frameTable (
+          tr (intagAttr "th" "rowspan=\"3\"" "ед.ч." ++ 
+              th "нечленувано" ++ td (n.s ! (NF Sg Indef))) ++
+          tr (th "членувано" ++ td (n.s ! (NF Sg Def))) ++
+          tr (th "пълен член" ++ td (n.s ! NFSgDefNom)) ++
+          tr (intagAttr "th" "rowspan=\"2\"" "мн.ч." ++ 
+              th "нечленувано" ++ td (n.s ! (NF Pl Indef))) ++
+          tr (th "членувано" ++ td (n.s ! (NF Pl Def))) ++
+          tr (intagAttr "th" "colspan=\"2\"" "звателна форма" ++ td (n.s ! NFVocative)) ++
+          tr (intagAttr "th" "colspan=\"2\"" "бройна форма" ++ td (n.s ! NFPlCount))
+        ) ;
+    s3 = ""
+    } ;
+
+  InflectionA, InflectionA2 = \a -> {
+    s1= heading1 ("Прилагателно") ;
+    s2= frameTable (
+          tr (intagAttr "th" "rowspan=\"7\"" "ед.ч." ++ 
+              intagAttr "th" "rowspan=\"3\"" "мн.ч." ++ 
+              th "нечленувано" ++ 
+              td (a.s ! (ASg Masc Indef))) ++
+          tr (th "непълен член" ++ td (a.s ! (ASg Masc Def))) ++
+          tr (th "пълен член" ++ td (a.s ! ASgMascDefNom)) ++
+          tr (intagAttr "th" "rowspan=\"2\"" "ж.р." ++
+              th "нечленувано" ++ td (a.s ! (ASg Fem Indef))) ++
+          tr (th "членувано" ++ td (a.s ! (ASg Fem Def))) ++
+          tr (intagAttr "th" "rowspan=\"2\"" "ср.р." ++
+              th "нечленувано" ++ td (a.s ! (ASg Neut Indef))) ++
+          tr (th "членувано" ++ td (a.s ! (ASg Neut Def))) ++
+          tr (intagAttr "th" "colspan=\"2\" rowspan=\"2\"" "мн.ч." ++
+              th "нечленувано" ++ td (a.s ! (APl Indef))) ++
+          tr (th "членувано" ++ td (a.s ! (APl Def)))
+        ) ;
+    s3= ""
+    } ;
+
+  InflectionAdv = \adv -> {
+    s1= heading1 ("Наречие") ;
+    s2= paragraph (adv.s) ;
+    s3= ""
+    } ;
+
+  InflectionPrep = \prep -> {
+    s1= heading1 ("Предлог") ;
+    s2= paragraph (prep.s) ;
+    s3= ""
+    } ;
+
+  InflectionV v = {
+    s1= heading1 ("Глагол") ++
+        "<подлог>" ++
+        case v.vtype of {
+          VNormal => "" ;
+          VMedial c => reflClitics ! c ;
+          VPhrasal c => personalClitics ! c ! GSg Masc ! P3
+        } ++ v.s ! Imperf ! VPres Sg P3 ;
+    s2= inflVerb v ;
+    s3= ""
+  } ;
+
+  InflectionV2 v = {
+    s1= heading1 ("Глагол") ++
+        "<подлог>" ++
+        case v.vtype of {
+          VNormal => "" ;
+          VMedial c => reflClitics ! c ;
+          VPhrasal c => personalClitics ! c ! GSg Masc ! P3
+        } ++
+        v.s ! Imperf ! VPres Sg P3 ++
+        v.c2.s ++
+        "<допълнение>";
+    s2= inflVerb v ;
+    s3= ""
+  } ;
+
+  InflectionV3 v = {
+    s1= heading1 ("Глагол") ++
+        "<подлог>" ++
+        case v.vtype of {
+          VNormal => "" ;
+          VMedial c => reflClitics ! c ;
+          VPhrasal c => personalClitics ! c ! GSg Masc ! P3
+        } ++
+        v.s ! Imperf ! VPres Sg P3 ++
+        v.c2.s ++
+        "<арг1>"++
+        v.c3.s ++
+        "<арг2>";
+    s2= inflVerb v ;
+    s3= ""
+  } ;
+
+  InflectionV2V v = {
+    s1= "<подлог>" ++
+        case v.vtype of {
+          VNormal => "" ;
+          VMedial c => reflClitics ! c ;
+          VPhrasal c => personalClitics ! c ! GSg Masc ! P3
+        } ++
+        v.s ! Imperf ! VPres Sg P3 ++
+        v.c2.s ++
+        "<допълнение>"++
+        v.c3.s ++
+        "да" ++ "<глагол>";
+    s2= inflVerb v ;
+    s3= ""
+  } ;
+
+  InflectionV2S v = {
+    s1= "<подлог>" ++
+        case v.vtype of {
+          VNormal => "" ;
+          VMedial c => reflClitics ! c ;
+          VPhrasal c => personalClitics ! c ! GSg Masc ! P3
+        } ++
+        v.s ! Imperf ! VPres Sg P3 ++
+        v.c2.s ++
+        "<допълнение>"++
+        v.c3.s ++
+        "че" ++ "<изречение>";
+    s2= inflVerb v ;
+    s3= ""
+  } ;
+
+  InflectionV2Q v = {
+    s1= "<подлог>" ++
+        case v.vtype of {
+          VNormal => "" ;
+          VMedial c => reflClitics ! c ;
+          VPhrasal c => personalClitics ! c ! GSg Masc ! P3
+        } ++
+        v.s ! Imperf ! VPres Sg P3 ++
+        v.c2.s ++
+        "<допълнение>"++
+        v.c3.s ++
+        "<въпрос>";
+    s2= inflVerb v ;
+    s3= ""
+  } ;
+
+  InflectionV2A v = {
+    s1= "<подлог>" ++
+        case v.vtype of {
+          VNormal => "" ;
+          VMedial c => reflClitics ! c ;
+          VPhrasal c => personalClitics ! c ! GSg Masc ! P3
+        } ++
+        v.s ! Imperf ! VPres Sg P3 ++
+        v.c2.s ++
+        "<допълнение>"++
+        "<прилагателно>";
+    s2= inflVerb v ;
+    s3= ""
+  } ;
+
+  InflectionVV = \v -> {
+    s1= "<подлог>" ++
+        case v.vtype of {
+          VNormal => "" ;
+          VMedial c => reflClitics ! c ;
+          VPhrasal c => personalClitics ! c ! GSg Masc ! P3
+        } ++
+        v.s ! Imperf ! VPres Sg P3 ++
+        case v.typ of {
+          VVInf => "да" ++ "<глагол>";
+          VVGerund => "<деепричастие>"
+        };
+    s2= inflVerb v ;
+    s3= ""
+  } ;
+
+  InflectionVS = \v -> {
+    s1= "<подлог>" ++
+        case v.vtype of {
+          VNormal => "" ;
+          VMedial c => reflClitics ! c ;
+          VPhrasal c => personalClitics ! c ! GSg Masc ! P3
+        } ++
+        v.s ! Imperf ! VPres Sg P3 ++
+        "че" ++ "<изречение>";
+    s2= inflVerb v ;
+    s3= ""
+  } ;
+
+  InflectionVQ = \v -> {
+    s1= "<подлог>" ++
+        case v.vtype of {
+          VNormal => "" ;
+          VMedial c => reflClitics ! c ;
+          VPhrasal c => personalClitics ! c ! GSg Masc ! P3
+        } ++
+        v.s ! Imperf ! VPres Sg P3 ++
+        "<въпрос>";
+    s2= inflVerb v ;
+    s3= ""
+  } ;
+
+  InflectionVA = \v -> {
+    s1= "<подлог>" ++
+        case v.vtype of {
+          VNormal => "" ;
+          VMedial c => reflClitics ! c ;
+          VPhrasal c => personalClitics ! c ! GSg Masc ! P3
+        } ++
+        v.s ! Imperf ! VPres Sg P3 ++
+        "<прилагателно>";
+    s2= inflVerb v ;
+    s3= ""
+  } ;
+
+oper
+  inflVerb : Verb -> Str = \v ->
+    (heading2 ("Несвършен вид") ++
+     heading3 ("Изявително наклонение") ++
+     heading4 ("Сегашно време") ++
+     finite Imperf VPres ++
+     heading4 ("Минало свършено време (аорист)") ++
+     finite Imperf VAorist ++
+     heading4 ("Минало несвършено време (имперфект)") ++
+     finite Imperf VImperfect ++
+     heading3 ("Повелително наклонение") ++
+     imperative Imperf ++
+     heading3 ("Причастия (отглаголни прилагателни)") ++
+     heading4 ("Минало страдателно причастие") ++
+     participle Imperf VPassive ++
+     heading4 ("Минало свършено деятелно причастие") ++
+     participle Imperf VPerfect ++
+     heading4 ("Минало несвършено деятелно причастие") ++
+     participle Imperf VPluPerfect ++
+     heading4 ("Сегашно деятелно причастие") ++
+     participle Imperf VPresPart ++
+     heading2 ("Свършен вид") ++
+     heading3 ("Изявително наклонение") ++
+     heading4 ("Сегашно време") ++
+     finite Perf VPres ++
+     heading4 ("Минало свършено време (аорист)") ++
+     finite Perf VAorist ++
+     heading4 ("Минало несвършено време (имперфект)") ++
+     finite Perf VImperfect ++
+     heading3 ("Повелително наклонение") ++
+     imperative Perf ++
+     heading3 ("Причастия (отглаголни прилагателни)") ++
+     heading4 ("Минало страдателно причастие") ++
+     participle Perf VPassive ++
+     heading4 ("Минало свършено деятелно причастие") ++
+     participle Perf VPerfect ++
+     heading4 ("Минало несвършено деятелно причастие") ++
+     participle Perf VPluPerfect ++
+     heading1 ("Отглаголно съществително") ++
+     frameTable (
+       tr (intagAttr "th" "rowspan=\"2\"" "ед.ч." ++ 
+           th "нечленувано" ++ td (v.s ! Imperf ! VNoun (NF Sg Indef))) ++
+       tr (th "членувано" ++ td (v.s ! Imperf ! VNoun (NF Sg Def))) ++
+       tr (intagAttr "th" "rowspan=\"2\"" "мн.ч." ++ 
+           th "нечленувано" ++ td (v.s ! Imperf ! VNoun (NF Pl Indef))) ++
+       tr (th "членувано" ++ td (v.s ! Imperf ! VNoun (NF Pl Def)))
+     ) ++
+     heading1 ("Деепричастие (отглаголно наречие)") ++
+     paragraph (v.s ! Imperf ! VGerund))
+  where {
+    finite : Aspect -> (Number -> Person -> VForm) -> Str = \aspect,f ->
+      frameTable (
+        tr (th "" ++
+            th "ед.ч." ++
+            th "мн.ч.") ++
+        tr (th "1 л." ++ 
+            td (v.s ! aspect ! f Sg P1) ++ 
+            td (v.s ! aspect ! f Pl P1)) ++
+        tr (th "2 л." ++ 
+            td (v.s ! aspect ! f Sg P2) ++
+            td (v.s ! aspect ! f Pl P2)) ++
+        tr (th "3 л." ++
+            td (v.s ! aspect ! f Sg P3) ++
+            td (v.s ! aspect ! f Pl P3))
+      ) ;
+
+    imperative : Aspect -> Str = \aspect ->
+      frameTable (
+        tr (th "ед.ч." ++
+            th "мн.ч.") ++
+        tr (td (v.s ! aspect ! VImperative Sg) ++ 
+            td (v.s ! aspect ! VImperative Pl))
+      ) ;
+
+    participle : Aspect -> (AForm -> VForm) -> Str = \aspect,f ->
+      frameTable (
+        tr (intagAttr "th" "rowspan=\"7\"" "ед.ч." ++
+            intagAttr "th" "rowspan=\"3\"" "м.р." ++
+            th "нечленувано" ++
+            td (v.s ! aspect ! f (ASg Masc Indef))) ++
+        tr (th "непълен член" ++
+            td (v.s ! aspect ! f (ASg Masc Def))) ++
+        tr (th "пълен член" ++
+            td (v.s ! aspect ! f ASgMascDefNom)) ++
+        tr (intagAttr "th" "rowspan=\"2\"" "ж.р." ++
+            th "нечленувано" ++
+            td (v.s ! aspect ! f (ASg Fem Indef))) ++
+        tr (th "членувано" ++
+            td (v.s ! aspect ! f (ASg Fem Def))) ++
+        tr (intagAttr "th" "rowspan=\"2\"" "ср.р." ++
+            th "нечленувано" ++
+            td (v.s ! aspect ! f (ASg Neut Indef))) ++
+        tr (th "членувано" ++
+            td (v.s ! aspect ! f (ASg Neut Def))) ++
+        tr (intagAttr "th" "rowspan=\"2\" colspan=\"2\"" "мн.ч." ++
+            th "нечленувано" ++
+            td (v.s ! aspect ! f (APl Indef))) ++
+        tr (th "членувано" ++
+            td (v.s ! aspect ! f (APl Def)))
+      ) ;
+  } ;
+  
+lin
+  MkDocument b i e = {s = i.s1 ++ b.s ++ i.s2 ++ i.s3 ++ e.s} ;
+
+}
+
--- a/lib/src/bulgarian/ParseBul.gf
+++ b/lib/src/bulgarian/ParseBul.gf
@@ -162,129 +162,4 @@ lin

  UttAdV adv = adv;

-lincat
-    Feat = Str;
-lin FeatN2, FeatN = \n ->
-      case n.g of {
-        AMasc Human    => "(м.р.л.)" ;
-        AMasc NonHuman => "(м.р.)" ;
-        AFem           => "(ж.р.)" ;
-        ANeut          => "(ср.р.)"
-      } ;
-    FeatV = \v ->
-      "<подлог>" ++
-      case v.vtype of {
-        VNormal => "" ;
-        VMedial c => reflClitics ! c ;
-        VPhrasal c => personalClitics ! c ! GSg Masc ! P3
-      } ++
-      v.s ! Imperf ! VPres Sg P3 ;
-    FeatV2 = \v ->
-      "<подлог>" ++
-      case v.vtype of {
-        VNormal => "" ;
-        VMedial c => reflClitics ! c ;
-        VPhrasal c => personalClitics ! c ! GSg Masc ! P3
-      } ++
-      v.s ! Imperf ! VPres Sg P3 ++
-      v.c2.s ++
-      "<допълнение>";
-    FeatV3 = \v ->
-      "<подлог>" ++
-      case v.vtype of {
-        VNormal => "" ;
-        VMedial c => reflClitics ! c ;
-        VPhrasal c => personalClitics ! c ! GSg Masc ! P3
-      } ++
-      v.s ! Imperf ! VPres Sg P3 ++
-      v.c2.s ++
-      "<арг1>"++
-      v.c3.s ++
-      "<арг2>";
-    FeatV2V = \v ->
-      "<подлог>" ++
-      case v.vtype of {
-        VNormal => "" ;
-        VMedial c => reflClitics ! c ;
-        VPhrasal c => personalClitics ! c ! GSg Masc ! P3
-      } ++
-      v.s ! Imperf ! VPres Sg P3 ++
-      v.c2.s ++
-      "<допълнение>"++
-      v.c3.s ++
-      "да" ++ "<глагол>";
-    FeatV2S = \v ->
-      "<подлог>" ++
-      case v.vtype of {
-        VNormal => "" ;
-        VMedial c => reflClitics ! c ;
-        VPhrasal c => personalClitics ! c ! GSg Masc ! P3
-      } ++
-      v.s ! Imperf ! VPres Sg P3 ++
-      v.c2.s ++
-      "<допълнение>"++
-      v.c3.s ++
-      "че" ++ "<изречение>";
-    FeatV2Q = \v ->
-      "<подлог>" ++
-      case v.vtype of {
-        VNormal => "" ;
-        VMedial c => reflClitics ! c ;
-        VPhrasal c => personalClitics ! c ! GSg Masc ! P3
-      } ++
-      v.s ! Imperf ! VPres Sg P3 ++
-      v.c2.s ++
-      "<допълнение>"++
-      v.c3.s ++
-      "<въпрос>";
-    FeatV2A = \v ->
-      "<подлог>" ++
-      case v.vtype of {
-        VNormal => "" ;
-        VMedial c => reflClitics ! c ;
-        VPhrasal c => personalClitics ! c ! GSg Masc ! P3
-      } ++
-      v.s ! Imperf ! VPres Sg P3 ++
-      v.c2.s ++
-      "<допълнение>"++
-      "<прилагателно>";
-    FeatVV = \v ->
-      "<подлог>" ++
-      case v.vtype of {
-        VNormal => "" ;
-        VMedial c => reflClitics ! c ;
-        VPhrasal c => personalClitics ! c ! GSg Masc ! P3
-      } ++
-      v.s ! Imperf ! VPres Sg P3 ++
-      case v.typ of {
-        VVInf => "да" ++ "<глагол>";
-        VVGerund => "<деепричастие>"
-      };
-    FeatVS = \v ->
-      "<подлог>" ++
-      case v.vtype of {
-        VNormal => "" ;
-        VMedial c => reflClitics ! c ;
-        VPhrasal c => personalClitics ! c ! GSg Masc ! P3
-      } ++
-      v.s ! Imperf ! VPres Sg P3 ++
-      "че" ++ "<изречение>";
-    FeatVQ = \v ->
-      "<подлог>" ++
-      case v.vtype of {
-        VNormal => "" ;
-        VMedial c => reflClitics ! c ;
-        VPhrasal c => personalClitics ! c ! GSg Masc ! P3
-      } ++
-      v.s ! Imperf ! VPres Sg P3 ++
-      "<въпрос>";
-    FeatVA = \v ->
-      "<подлог>" ++
-      case v.vtype of {
-        VNormal => "" ;
-        VMedial c => reflClitics ! c ;
-        VPhrasal c => personalClitics ! c ! GSg Masc ! P3
-      } ++
-      v.s ! Imperf ! VPres Sg P3 ++
-      "<прилагателно>";
 }