implement UsePron

(Ger) Corrections in Cat, Irreg, Lexicon ; added QVP in Question and GenIP, GenModIP in Extend

.github/workflows/release.yml

@@ -8,19 +8,26 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-24.04
     env:
-      GF_VERSION: 3.10-1
+      GF_VERSION: 3.12
       DEST: gf-rgl-${{ github.event.inputs.tag  }}
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
+
+    - name: Download GF
+      uses: dsaltares/fetch-gh-release-asset@1.1.1
+      with:
+        repo: 'GrammaticalFramework/gf-core'
+        version: 'tags/release-${{ env.GF_VERSION }}'
+        file: 'gf-${{ env.GF_VERSION }}-ubuntu-24.04.deb'
+        token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Install GF
       run: |
-        curl -s https://www.grammaticalframework.org/download/gf_${GF_VERSION}_amd64.deb -o gf.deb
-        sudo dpkg -i gf.deb
+        sudo dpkg -i gf-${GF_VERSION}-ubuntu-24.04.deb
 
     - name: Build RGL
       run: |

.github/workflows/test.yml

@@ -6,26 +6,26 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-24.04
     env:
-      GF_VERSION: 3.11
+      GF_VERSION: 3.12
       DEST: gf-rgl
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
     - name: Download GF
       uses: dsaltares/fetch-gh-release-asset@1.1.1
       with:
         repo: 'GrammaticalFramework/gf-core'
-        version: 'tags/${{ env.GF_VERSION }}'
-        file: 'gf-${{ env.GF_VERSION }}-ubuntu-20.04.deb'
+        version: 'tags/release-${{ env.GF_VERSION }}'
+        file: 'gf-${{ env.GF_VERSION }}-ubuntu-24.04.deb'
         token: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Install GF
       run: |
-        sudo dpkg -i gf-${GF_VERSION}-ubuntu-20.04.deb
+        sudo dpkg -i gf-${GF_VERSION}-ubuntu-24.04.deb
 
     - name: Build RGL
       run: |

Config.hs

@@ -25,6 +25,7 @@ data LangInfo = LangInfo
   , langSymbolic :: Bool
   , langCompatibility :: Bool
   , langSynopsis :: Bool -- ^ include in RGL synopsis
+  , langMorphodict :: Bool
   } deriving (Show,Eq)
 
 -- | Load language information from default config file
@@ -55,6 +56,7 @@ loadLangsFrom configFile = do
             , langSymbolic = boolBit bits 8 True
             , langCompatibility = boolBit bits 9 False
             , langSynopsis = boolBit bits 10 False
+            , langMorphodict = boolBit bits 11 False
             }
 
 -- | Separate a string on a character

Makefile

@@ -19,6 +19,7 @@ default: build copy
 build: src/*/*.gf
 ifneq (, $(RUNGHC))
 	$(RUNGHC) build
+	$(RUNGHC) build morphodict
 else
 	./Setup.sh
 endif
@@ -26,6 +27,7 @@ endif
 copy:
 ifneq (, $(RUNGHC))
 	$(RUNGHC) copy
+	$(RUNGHC) copy morphodict
 endif
 
 install: build copy

Setup.hs

@@ -1,4 +1,4 @@
-{-# LANGUAGE CPP #-}
+{-# LANGUAGE CPP, LambdaCase #-}
 
 -- | Main build script for RGL
 
@@ -150,11 +150,12 @@ getRGLBuildSubDir mode =
   case mode of
     Present   -> "present"
     AllTenses -> "alltenses"
+    MorphoDict -> "morphodict"
 
 -------------------------------------------------------------------------------
 -- Build modes
 
-data Mode = Present | AllTenses
+data Mode = Present | AllTenses | MorphoDict
   deriving (Show,Eq)
 
 all_modes :: [String]
@@ -187,6 +188,7 @@ rglCommands =
   , RGLCommand "lang"    False $ gfcp [l,s]
   , RGLCommand "api"     False $ gfcp [t,sc]
   , RGLCommand "compat"  False $ gfcp [c]
+  , RGLCommand "morphodict" False $ gfcp [m]
 
   -- Special command, invoked when command ends in .gf
   , RGLCommand "modules"  False $ \modes args bi ->  do
@@ -223,14 +225,20 @@ rglCommands =
     s mode args = (symbol,optml mode langTry args)
     c mode args = (compat,optml AllTenses langCompatibility args)
     t mode args = (try,optml mode langTry args)
+    m mode args = (morphodict,optml mode langMorphodict args)
     sc mode args = (symbolic,optml mode langSymbolic args)
 
     optml :: Mode -> (LangInfo -> Bool) -> [String] -> ([LangInfo] -> [LangInfo])
     optml mode pred args =
       \langsAll ->
-        let langsDefault = filter (if mode == Present then langPresent else const True) (filter pred langsAll)
+        let langsDefault = filter (mode2langinfo mode) (filter pred langsAll)
         in  getOptLangs langsAll langsDefault args
 
+    mode2langinfo = \case
+      Present    -> langPresent
+      MorphoDict -> langMorphodict
+      _          -> const True
+
 -------------------------------------------------------------------------------
 -- Getting module paths/names
 
@@ -260,6 +268,9 @@ syntax l = sourceDir </> "api" </> ("Syntax" ++ langCode l ++ ".gf")
 symbolic :: LangInfo -> FilePath
 symbolic l = sourceDir </> "api" </> ("Symbolic" ++ langCode l ++ ".gf")
 
+morphodict :: LangInfo -> FilePath
+morphodict l = sourceDir </> "morphodict" </> ("MorphoDict" ++ langCode l ++ ".gf")
+
 -------------------------------------------------------------------------------
 -- Argument helpers
 
@@ -302,8 +313,9 @@ getOptMode args =
     else explicit_modes
   where
     explicit_modes =
-      [Present|have "present"]++
-      [AllTenses|have "alltenses"]
+      [Present | have "present"] ++
+      [AllTenses | have "alltenses"] ++
+      [MorphoDict | have "morphodict"]
     have mode = mode `elem` args
 
 -- | List of languages overriding the default definitions
@@ -367,7 +379,7 @@ gfcn bi mode summary files = do
   let dir = getRGLBuildDir bi mode
       preproc = case mode of
                   Present -> "--preproc=mkPresent"
-                  AllTenses -> ""
+                  _       -> ""
   createDirectoryIfMissing True dir
   if length files > 0
   then do

Setup.sh

@@ -59,6 +59,7 @@ gfc="${gf} --batch --quiet --gf-lib-path=${dist}"
 mkdir -p "${dist}/prelude"
 mkdir -p "${dist}/present"
 mkdir -p "${dist}/alltenses"
+mkdir -p "${dist}/morphodict"
 
 # Build: prelude
 echo "Building [prelude]"
@@ -68,6 +69,7 @@ ${gfc} --gfo-dir="${dist}"/prelude "${src}"/prelude/*.gf
 # Gather all language modules for building
 modules_present=
 modules_alltenses=
+modules_morphodict=
 for lang in $langs; do
   for mod in $modules_langs $modules_api; do
     if [ $mod == "Compatibility" ] && [[ "$langs_compat" != *"$lang"* ]]; then continue; fi
@@ -80,8 +82,12 @@ for lang in $langs; do
       modules_alltenses="${modules_alltenses} ${file}"
     done
   done
+  file="${src}/morphodict/MorphoDict${lang}.gf"
+  if [ ! -f "$file" ]; then continue; fi
+  modules_morphodict="${modules_morphodict} ${file}"
 done
 
+
 # Build: present
 echo "Building [present]"
 if [ $verbose = true ]; then echo $modules_present; fi
@@ -96,6 +102,13 @@ for module in $modules_alltenses; do
   ${gfc} --no-pmcfg --gfo-dir="${dist}"/alltenses "${module}"
 done
 
+# Build: morphodict
+echo "Building [morphodict]"
+if [ $verbose = true ]; then echo $modules_morphodict; fi
+for module in $modules_morphodict; do
+  ${gfc} --no-pmcfg --gfo-dir="${dist}"/morphodict "${module}"
+done
+
 # Copy
 if [ $dest == $dist ]; then exit 0; fi
 echo "Copying to ${dest}"

languages.csv

@@ -1,55 +1,64 @@
-Code,Name,Directory,Functor,Unlexer,Present,All,Try,Symbolic,Compatibility,Synopsis
-Afr,Afrikaans,afrikaans,,,,,,n,,y
-Amh,Amharic,amharic,,,,,n,n,,n
-Ara,Arabic,arabic,,,,,,y,,y
-Bul,Bulgarian,bulgarian,,,y,,,,,y
-Cat,Catalan,catalan,Romance,,y,,,,y,y
-Cgg,Rukiga,rukiga,,,y,y,n,n,y,y
-Chi,Chinese (simplified),chinese,,,,,,,,y
-Cze,Czech,czech,,,,,,n,,y
-Dan,Danish,danish,Scand,,y,,,,,y
-Dut,Dutch,dutch,,,y,,,,,y
-Eng,English,english,,,y,,,,y,y
-Est,Estonian,estonian,,,,,,,,y
-Eus,Basque,basque,,,,,,,,y
-Fin,Finnish,finnish,,,y,,,,y,y
-Fre,French,french,Romance,,y,,,,y,y
-Ger,German,german,,,y,,,,,y
-Grc,Ancient Greek,ancient_greek,,,y,,n,n,,n
-Gre,Greek,greek,,,,,,,,y
-Heb,Hebrew,hebrew,,,,,n,n,,n
-Hin,Hindi,hindi,Hindustani,to_devanagari,y,,,,,y
-Hrv,Croatian,croatian,,,,,,y,,n
-Hun,Hungarian,hungarian,,,n,y,y,y,n,n
-Ice,Icelandic,icelandic,,,,,,n,,y
-Ina,Interlingua,interlingua,,,y,,n,n,,n
-Ita,Italian,italian,Romance,,y,,,,y,y
-Jpn,Japanese,japanese,,,,,,,,y
-Kor,Korean,korean,,,n,y,y,y,n,n
-Lat,Latin,latin,,,,,y,y,n,y
-Lav,Latvian,latvian,,,,,,,y,y
-May,Malay,malay,,,y,,,,n,y
-Mlt,Maltese,maltese,,,,,,,,y
-Mon,Mongolian,mongolian,,,,,,n,,y
-Nep,Nepali,nepali,,,,,,n,,y
-Nno,Norwegian (nynorsk),nynorsk,,,y,,,,,y
-Nor,Norwegian (bokmål),norwegian,Scand,,y,,,,,y
-Pes,Persian,persian,,,,,,,,y
-Pnb,Punjabi,punjabi,,,y,,,,,y
-Pol,Polish,polish,,,,,,,,y
-Por,Portuguese,portuguese,Romance,,y,,,,y,y
-Ron,Romanian,romanian,,,y,,,,,y
-Rus,Russian,russian,,,y,,,,,y
-Slo,Slovak,slovak,,,,,,n,,y
-Slv,Slovenian,slovenian,,,,,n,n,,n
-Snd,Sindhi,sindhi,,,,,,,,y
-Spa,Spanish,spanish,Romance,,y,,,,y,y
-Swa,Swahili,swahili,Bantu,,,y,n,n,n,n
-Swe,Swedish,swedish,Scand,,y,,,,y,y
-Tam,Tamil,tamil,n,n,n,n,n,n,n,n
-Tel,Telugu,telugu,,,y,n,n,n,,n
-Tha,Thai,thai,,to_thai,,,,,,y
-Tur,Turkish,turkish,,,y,,,n,,n
-Urd,Urdu,urdu,Hindustani,,,,,,,y
-Som,Somali,somali,,,,,n,n,,n
-Zul,Zulu,zulu,,,,,n,n,,n
+Code,Name,Directory,Functor,Unlexer,Present,All,Try,Symbolic,Compatibility,Synopsis,MorphoDict
+Afr,Afrikaans,afrikaans,,,,,,n,,y,n
+Amh,Amharic,amharic,,,,,n,n,,n,n
+Ara,Arabic,arabic,,,,,,y,,y,y
+Bel,Belarusian,belarusian,,,,y,n,n,n,y,n
+Bul,Bulgarian,bulgarian,,,y,,,,,y,n
+Cat,Catalan,catalan,Romance,,y,,,,y,y,n
+Cgg,Rukiga,rukiga,,,y,y,n,n,y,y,n
+Chi,Chinese (simplified),chinese,,,,,,,,y,y
+Cze,Czech,czech,,,,,,n,,y,n
+Dan,Danish,danish,Scand,,y,,,,,y,n
+Dut,Dutch,dutch,,,y,,,,,y,n
+Eng,English,english,,,y,,,,y,y,y
+Est,Estonian,estonian,,,,,,,,y,n
+Eus,Basque,basque,,,,,,,,y,n
+Fao,Faroese,faroese,,,,y,n,n,n,y,n
+Fin,Finnish,finnish,,,y,,,,y,y,y
+Fre,French,french,Romance,,y,,,,y,y,y
+Gla,Gaelic,gaelic,,,,y,n,n,n,y,n
+Ger,German,german,,,y,,,,,y,y
+Grc,Ancient Greek,ancient_greek,,,y,,n,n,,n,n
+Gre,Greek,greek,,,,,,,,y,n
+Heb,Hebrew,hebrew,,,,,n,n,,n,n
+Hin,Hindi,hindi,Hindustani,to_devanagari,y,,,,,y,n
+Hrv,Croatian,croatian,,,,,,y,,n,n
+Hun,Hungarian,hungarian,,,n,y,y,y,n,n,n
+Hye,Armenian,armenian,,,,y,n,n,n,y,n
+Ice,Icelandic,icelandic,,,,,,n,,y,n
+Ina,Interlingua,interlingua,,,y,,n,n,,n,n
+Ita,Italian,italian,Romance,,y,,,,y,y,y
+Jpn,Japanese,japanese,,,,,,,,y,n
+Kaz,Kazakh,kazakh,,,,y,n,n,n,y,n
+Kor,Korean,korean,,,n,y,y,y,n,n,n
+Lat,Latin,latin,,,,,y,y,n,y,n
+Lav,Latvian,latvian,,,,,,,y,y,n
+Mkd,Macedonian,macedonian,,,,y,n,n,n,y,n
+May,Malay,malay,,,y,,,,n,y,n
+Mlt,Maltese,maltese,,,,,,,,y,n
+Mon,Mongolian,mongolian,,,,,,n,,y,n
+Nep,Nepali,nepali,,,,,,n,,y,n
+Nno,Norwegian (nynorsk),nynorsk,,,y,,,,,y,n
+Nor,Norwegian (bokmål),norwegian,Scand,,y,,,,,y,n
+Pes,Persian,persian,,,,,,,,y,n
+Pnb,Punjabi,punjabi,,,y,,,,,y,n
+Pol,Polish,polish,,,,,,,,y,n
+Por,Portuguese,portuguese,Romance,,y,,,,y,y,y
+Ron,Romanian,romanian,,,y,,,,,y,n
+Rus,Russian,russian,,,y,,,,,y,n
+Slo,Slovak,slovak,,,,,,n,,y,n
+Slv,Slovenian,slovenian,,,,,n,n,,n,n
+Snd,Sindhi,sindhi,,,,,,,,y,n
+Spa,Spanish,spanish,Romance,,y,,,,y,y,y
+Sqi,Albanian,albanian,,,,y,n,n,n,y,n
+Sco,Scots,scots,,,y,,,,,y,n
+Swa,Swahili,swahili,Bantu,,,y,n,n,n,n,n
+Swe,Swedish,swedish,Scand,,y,,,,y,y,y
+Tam,Tamil,tamil,n,n,n,n,n,n,n,n,n
+Tel,Telugu,telugu,,,y,n,n,n,,n,n
+Tha,Thai,thai,,to_thai,,,,,,y,n
+Tur,Turkish,turkish,,,y,,,n,,n,n
+Ukr,Ukrainian,ukrainian,,,,y,n,n,n,y,n
+Urd,Urdu,urdu,Hindustani,,,,,,,y,n
+Som,Somali,somali,,,,,n,n,,n,n
+Zul,Zulu,zulu,,,,,n,n,,n,n

src/abstract/Extend.gf

@@ -299,10 +299,10 @@ fun
 fun
   CardCNCard : Card -> CN -> Card ;  -- three million, four lakh, six dozen etc
 
-fun
-  AnaphPron : NP -> Pron ;
-
 fun
   TPastSimple : Tense ;
 
+fun
+  SubjunctRelCN : CN -> RS -> CN ; -- e.g. Romance languages when subjunctive/conjunctive is needed
+
 }

src/afrikaans/CatAfr.gf

@@ -89,4 +89,17 @@ concrete CatAfr of Cat =
     SN = {s : Sex => NPCase => Str; pl : NPCase => Str} ;
     LN = {s : Adjf => NPCase => Str ; hasArt : Bool ; n : Number} ;
 
+lindef
+    VPSlash = \s -> {
+      s  = {s = \\_ => s; prefix = ""; aux = VHebben; vtype = VAct} ;
+      a1 = \\_ => "" ;
+      n0 = \\_ => "" ;
+      n2 = \\_ => "" ;
+      a2 = "" ;
+      isAux = False ;
+      inf = <"",False> ;
+      ext = "" ;
+      c2 = ""
+      } ;
+
 }

src/afrikaans/ResAfr.gf

@@ -315,7 +315,7 @@ param
 
 --2 Transformations between parameter types
 
-  oper Agr : Type = {g : Gender ; n : Number ; p : Person} ;
+  oper Agr : PType = {g : Gender ; n : Number ; p : Person} ;
 
   oper
     agrP3 : Number -> Agr = agrgP3 Neutr ;

src/albanian/AdjectiveSqi.gf

@@ -0,0 +1,11 @@
+concrete AdjectiveSqi of Adjective = CatSqi ** open ResSqi, Prelude in {
+
+  lin
+    PositA  a = {
+      s = \\spec,c,g,n => case a.clit of {
+                            True  => link_clitic ! spec ! c ! g ! n ++ a.s ! c ! g ! n ;
+                            False => a.s ! c ! g ! n
+                          }
+      } ;
+
+}

src/albanian/AllSqi.gf

@@ -0,0 +1,4 @@
+concrete AllSqi of AllSqiAbs =
+  LangSqi
+  **
+    {} ;

src/albanian/AllSqiAbs.gf

@@ -0,0 +1,3 @@
+abstract AllSqiAbs =
+  Lang
+  ** {}

src/albanian/CatSqi.gf

@@ -0,0 +1,25 @@
+concrete CatSqi of Cat = CommonX ** open ParamX, Prelude, ResSqi in {
+
+lincat N = Noun ;
+lincat N2 = Noun ** {c2 : Compl} ;
+lincat N3 = Noun ** {c2,c3 : Compl} ;
+lincat A = Adj ;
+lincat A2 = Adj ** {c2 : Compl} ;
+lincat V, VA, VV, VS, VQ = Verb ;
+lincat V2, V2S, V2Q = Verb ** {c2 : Compl} ;
+lincat V3, V2A, V2V = Verb ** {c2,c3 : Compl} ;
+lincat Prep = Compl ;
+
+lincat Numeral = {s : Str} ;
+lincat Digits  = {s : Str; n : Number; tail : DTail} ;
+lincat Decimal = {s : Str; n : Number; hasDot : Bool} ;
+
+lincat AP = {s: Species => Case => Gender => Number => Str} ;
+lincat CN = Noun ;
+lincat Num = {s : Str; n : Number} ;
+lincat Quant = {s : Case => Gender => Number => Str; spec : Species} ;
+lincat Det = {s : Case => Gender => Str; spec : Species; n : Number} ;
+lincat NP = {s: Case => Str; a : Agr} ;
+lincat Pron = {s: Case => Str; acc_clit, dat_clit : Str; a : Agr} ;
+
+}

src/albanian/DocumentationSqi.gf

@@ -0,0 +1,117 @@
+concrete DocumentationSqi of Documentation = CatSqi ** open
+  ParamX, ResSqi, Prelude, HTML in {
+
+lincat
+  Inflection = {t : Str; s1,s2,s3 : Str} ;
+  Definition = {s : Str} ;
+  Document   = {s : Str} ;
+  Tag        = {s : Str} ;
+
+lin InflectionN = \x -> {
+      t="em" ;
+      s1=heading1 ("Emër" ++
+                   case x.g of {
+                     Masc => "(mashkullor)" ;
+                     Fem  => "(femëror)"
+                   }) ;
+      s2=frameTable (
+           tr (intagAttr "th" "colspan=\"2\"" "" ++ th "Sg" ++ th "Pl") ++
+           tr (intagAttr "th" "rowspan=\"4\"" "Indef" ++ th "Nom" ++ td (x.s ! Indef ! Nom ! Sg) ++ td (x.s ! Indef ! Nom ! Pl)) ++
+           tr (th "Acc" ++ td (x.s ! Indef ! Acc ! Sg) ++ td (x.s ! Indef ! Acc ! Pl)) ++
+           tr (th "Dat" ++ td (x.s ! Indef ! Dat ! Sg) ++ td (x.s ! Indef ! Dat ! Pl)) ++
+           tr (th "Ablat" ++ td (x.s ! Indef ! Ablat ! Sg) ++ td (x.s ! Indef ! Ablat ! Pl)) ++
+           tr (intagAttr "th" "rowspan=\"4\"" "Def" ++ th "Nom" ++ td (x.s ! Def ! Nom ! Sg) ++ td (x.s ! Def ! Nom ! Pl)) ++
+           tr (th "Acc" ++ td (x.s ! Def ! Acc ! Sg) ++ td (x.s ! Def ! Acc ! Pl)) ++
+           tr (th "Dat" ++ td (x.s ! Def ! Dat ! Sg) ++ td (x.s ! Def ! Dat ! Pl)) ++
+           tr (th "Ablat" ++ td (x.s ! Def ! Ablat ! Sg) ++ td (x.s ! Def ! Ablat ! Pl))) ;
+      s3=[]
+    } ;
+lin InflectionA = \x -> {
+      t="mb" ;
+      s1=heading1 "Mbiemër" ;
+      s2=frameTable (
+           tr (intagAttr "th" "colspan=\"2\"" "" ++ th "Sg" ++ th "Pl") ++
+           tr (intagAttr "th" "rowspan=\"2\"" "Nom" ++ th "Masc" ++ td (y ! Nom ! Masc ! Sg) ++ td (y ! Nom ! Masc ! Pl)) ++
+           tr (th "Fem" ++ td (y ! Nom ! Fem ! Sg) ++ td (y ! Nom ! Fem ! Pl)) ++
+           tr (intagAttr "th" "rowspan=\"2\"" "Acc" ++ th "Masc" ++ td (y ! Acc ! Masc ! Sg) ++ td (y ! Acc ! Masc ! Pl)) ++
+           tr (th "Fem" ++ td (y ! Acc ! Fem ! Sg) ++ td (y ! Acc ! Fem ! Pl)) ++
+           tr (intagAttr "th" "rowspan=\"2\"" "Dat" ++ th "Masc" ++ td (y ! Dat ! Masc ! Sg) ++ td (y ! Dat ! Masc ! Pl)) ++
+           tr (th "Fem" ++ td (y ! Dat ! Fem ! Sg) ++ td (y ! Dat ! Fem ! Pl)) ++
+           tr (intagAttr "th" "rowspan=\"2\"" "Ablat" ++ th "Masc" ++ td (y ! Ablat ! Masc ! Sg) ++ td (y ! Ablat ! Masc ! Pl)) ++
+           tr (th "Fem" ++ td (y ! Ablat ! Fem ! Sg) ++ td (y ! Ablat ! Fem ! Pl))) ;
+      s3=[]
+    } where {
+        y : Case => Gender => Number => Str =
+          \\c,g,n => case x.clit of {
+                       True  => link_clitic ! Indef ! c ! g ! n ++ x.s ! c ! g ! n ;
+                       False => x.s ! c ! g ! n
+                     } ;
+    } ;
+lin InflectionV = \x -> {
+      t="fl" ;
+      s1=heading1 "Folje" ;
+      s2=frameTable (
+           tr (intagAttr "th" "rowspan=\"24\"" "Indicative" ++ intagAttr "th" "rowspan=\"6\"" "Pres" ++ intagAttr "th" "rowspan=\"3\"" "Sg" ++ th "P1" ++ td (x.Indicative ! Pres ! Sg ! P1)) ++
+           tr (th "P2" ++ td (x.Indicative ! Pres ! Sg ! P2)) ++
+           tr (th "P3" ++ td (x.Indicative ! Pres ! Sg ! P3)) ++
+           tr (intagAttr "th" "rowspan=\"3\"" "Pl" ++ th "P1" ++ td (x.Indicative ! Pres ! Pl ! P1)) ++
+           tr (th "P2" ++ td (x.Indicative ! Pres ! Pl ! P2)) ++
+           tr (th "P3" ++ td (x.Indicative ! Pres ! Pl ! P3)) ++
+           tr (intagAttr "th" "rowspan=\"6\"" "Past" ++ intagAttr "th" "rowspan=\"3\"" "Sg" ++ th "P1" ++ td (x.Indicative ! Past ! Sg ! P1)) ++
+           tr (th "P2" ++ td (x.Indicative ! Past ! Sg ! P2)) ++
+           tr (th "P3" ++ td (x.Indicative ! Past ! Sg ! P3)) ++
+           tr (intagAttr "th" "rowspan=\"3\"" "Pl" ++ th "P1" ++ td (x.Indicative ! Past ! Pl ! P1)) ++
+           tr (th "P2" ++ td (x.Indicative ! Past ! Pl ! P2)) ++
+           tr (th "P3" ++ td (x.Indicative ! Past ! Pl ! P3)) ++
+           tr (intagAttr "th" "rowspan=\"6\"" "Aorist" ++ intagAttr "th" "rowspan=\"3\"" "Sg" ++ th "P1" ++ td (x.Indicative ! Aorist ! Sg ! P1)) ++
+           tr (th "P2" ++ td (x.Indicative ! Aorist ! Sg ! P2)) ++
+           tr (th "P3" ++ td (x.Indicative ! Aorist ! Sg ! P3)) ++
+           tr (intagAttr "th" "rowspan=\"3\"" "Pl" ++ th "P1" ++ td (x.Indicative ! Aorist ! Pl ! P1)) ++
+           tr (th "P2" ++ td (x.Indicative ! Aorist ! Pl ! P2)) ++
+           tr (th "P3" ++ td (x.Indicative ! Aorist ! Pl ! P3)) ++
+           tr (intagAttr "th" "rowspan=\"6\"" "Imperfect" ++ intagAttr "th" "rowspan=\"3\"" "Sg" ++ th "P1" ++ td (x.Indicative ! Imperfect ! Sg ! P1)) ++
+           tr (th "P2" ++ td (x.Indicative ! Imperfect ! Sg ! P2)) ++
+           tr (th "P3" ++ td (x.Indicative ! Imperfect ! Sg ! P3)) ++
+           tr (intagAttr "th" "rowspan=\"3\"" "Pl" ++ th "P1" ++ td (x.Indicative ! Imperfect ! Pl ! P1)) ++
+           tr (th "P2" ++ td (x.Indicative ! Imperfect ! Pl ! P2)) ++
+           tr (th "P3" ++ td (x.Indicative ! Imperfect ! Pl ! P3)) ++
+           tr (intagAttr "th" "rowspan=\"2\"" "Imperative" ++ th "Sg" ++ td (x.Imperative ! Sg)) ++
+           tr (th "Pl" ++ td (x.Imperative ! Pl)) ++
+           tr (th "participle" ++ td (x.participle)) ++
+           tr (intagAttr "th" "rowspan=\"6\"" "pres_optative" ++ intagAttr "th" "rowspan=\"3\"" "Sg" ++ th "P1" ++ td (x.pres_optative ! Sg ! P1)) ++
+           tr (th "P2" ++ td (x.pres_optative ! Sg ! P2)) ++
+           tr (th "P3" ++ td (x.pres_optative ! Sg ! P3)) ++
+           tr (intagAttr "th" "rowspan=\"3\"" "Pl" ++ th "P1" ++ td (x.pres_optative ! Pl ! P1)) ++
+           tr (th "P2" ++ td (x.pres_optative ! Pl ! P2)) ++
+           tr (th "P3" ++ td (x.pres_optative ! Pl ! P3)) ++
+           tr (intagAttr "th" "rowspan=\"6\"" "perf_optative" ++ intagAttr "th" "rowspan=\"3\"" "Sg" ++ th "P1" ++ td (x.perf_optative ! Sg ! P1)) ++
+           tr (th "P2" ++ td (x.perf_optative ! Sg ! P2)) ++
+           tr (th "P3" ++ td (x.perf_optative ! Sg ! P3)) ++
+           tr (intagAttr "th" "rowspan=\"3\"" "Pl" ++ th "P1" ++ td (x.perf_optative ! Pl ! P1)) ++
+           tr (th "P2" ++ td (x.perf_optative ! Pl ! P2)) ++
+           tr (th "P3" ++ td (x.perf_optative ! Pl ! P3)) ++
+           tr (intagAttr "th" "rowspan=\"6\"" "pres_admirative" ++ intagAttr "th" "rowspan=\"3\"" "Sg" ++ th "P1" ++ td (x.pres_admirative ! Sg ! P1)) ++
+           tr (th "P2" ++ td (x.pres_admirative ! Sg ! P2)) ++
+           tr (th "P3" ++ td (x.pres_admirative ! Sg ! P3)) ++
+           tr (intagAttr "th" "rowspan=\"3\"" "Pl" ++ th "P1" ++ td (x.pres_admirative ! Pl ! P1)) ++
+           tr (th "P2" ++ td (x.pres_admirative ! Pl ! P2)) ++
+           tr (th "P3" ++ td (x.pres_admirative ! Pl ! P3)) ++
+           tr (intagAttr "th" "rowspan=\"6\"" "imperf_admirative" ++ intagAttr "th" "rowspan=\"3\"" "Sg" ++ th "P1" ++ td (x.imperf_admirative ! Sg ! P1)) ++
+           tr (th "P2" ++ td (x.imperf_admirative ! Sg ! P2)) ++
+           tr (th "P3" ++ td (x.imperf_admirative ! Sg ! P3)) ++
+           tr (intagAttr "th" "rowspan=\"3\"" "Pl" ++ th "P1" ++ td (x.imperf_admirative ! Pl ! P1)) ++
+           tr (th "P2" ++ td (x.imperf_admirative ! Pl ! P2)) ++
+           tr (th "P3" ++ td (x.imperf_admirative ! Pl ! P3))) ;
+      s3=[]
+    } ;
+lin InflectionAdv = \x -> {
+      t="nd" ;
+      s1=heading1 "Ndajfolje" ;
+      s2=frameTable (
+           tr (th "s" ++ td (x.s))) ;
+      s3=[]
+    } ;
+lin
+NoDefinition   t     = {s=t.s};
+MkDefinition   t d   = {s="<p><b>Definition:</b>"++t.s++d.s++"</p>"};
+MkDefinitionEx t d e = {s="<p><b>Definition:</b>"++t.s++d.s++"</p><p><b>Example:</b>"++e.s++"</p>"};lin  MkDocument d i e = {s = i.s1 ++ d.s ++ i.s2 ++ i.s3 ++ e.s} ;  MkTag i = {s = i.t} ;}

src/albanian/GrammarSqi.gf

@@ -0,0 +1,9 @@
+concrete GrammarSqi of Grammar =
+  NounSqi,
+  AdjectiveSqi,
+  NumeralSqi,
+  PhraseSqi,
+  StructuralSqi
+  ** {
+
+} ;

src/albanian/LangSqi.gf

@@ -0,0 +1,10 @@
+--# -path=.:../abstract
+concrete LangSqi of Lang =
+  GrammarSqi,
+  LexiconSqi
+  ,DocumentationSqi --# notpresent
+  ** {
+
+flags startcat = Phr ;
+
+}

src/albanian/LexiconSqi.gf

@@ -0,0 +1,8 @@
+concrete LexiconSqi of Lexicon = CatSqi ** open ParadigmsSqi in {
+
+lin
+  airplane_N = mkN032 "aeroplan" ;
+  apple_N = mkN069 "mollë" ;
+  good_A = mkA "mirë" ;
+
+}

src/albanian/NounSqi.gf

@@ -0,0 +1,40 @@
+concrete NounSqi of Noun = CatSqi ** open MorphoSqi, ResSqi in {
+
+  flags optimize=all_subs ;
+
+  lin
+    DetCN det cn = {
+      s = \\c => det.s ! c ! cn.g ++ cn.s ! det.spec ! c ! det.n ;
+      a = agrgP3 cn.g det.n
+      } ;
+
+    UsePron p = p ;
+
+    DetQuant quant num = {
+      s  = \\c,g => quant.s ! c ! g ! num.n ++ num.s ;
+      n  = num.n ;
+      spec = quant.spec
+      } ;
+
+    NumSg = {s = []; n = Sg} ;
+    NumPl = {s = []; n = Pl} ;
+
+    DefArt = {
+      s  = \\c,g,n => [] ;
+      spec = Def
+      } ;
+
+    IndefArt = {
+      s = \\c,g => table Number ["një"; []] ;
+      spec = Indef
+      } ;
+
+    UseN n = n ;
+    UseN2 n = n ;
+
+    AdjCN ap cn = {
+      s = \\spec,c,n => cn.s ! spec ! c ! n ++ ap.s ! spec ! c ! cn.g ! n ;
+      g = cn.g
+      } ;
+
+}

src/albanian/NumeralSqi.gf

@@ -0,0 +1,87 @@
+concrete NumeralSqi of Numeral = CatSqi ** open ParamX, Prelude in {
+
+oper bind : Str -> Str -> Str = \a -> \b -> a ++ b ;
+
+param DForm = unit | teen | ten ;
+
+oper LinDigit = {s : DForm => Str };
+oper LinSub100 = {s : Str } ;
+
+lincat Digit =      LinDigit ;
+lincat Sub10 =      LinDigit ;
+lincat Sub100 =     LinSub100 ;
+lincat Sub1000 =    LinSub100 ;
+lincat Sub1000000 = { s : Str } ;
+
+oper mkNum : Str -> LinDigit = \tri -> 
+  { s = table {unit => tri ; teen => tri + "mbë" + "dhjetë" ; ten => tri + "dhjetë" }};
+
+lin num x = {s = x.s } ; 
+
+lin n2 = {s = table {unit => "dy" ; teen => "dy" + "mbë" + "dhjetë" ; ten => "njëzet" }};
+lin n3 = mkNum "tre" ;
+lin n4 = {s = table {unit => "katër" ; teen => "katër" + "mbë" + "dhjetë" ; ten => "dyzet" } };
+lin n5 = mkNum "pesë" ;
+lin n6 = mkNum "gjashtë";
+lin n7 = mkNum "shtatë";
+lin n8 = mkNum "tetë";
+lin n9 = mkNum "nëntë";
+
+oper mkR : Str -> LinSub100 = \n -> {s = n } ;
+
+lin pot01 = { s = table {_ => "një" }};
+lin pot0 d = d ;
+lin pot110 = mkR "dhjetë" ;
+lin pot111 = mkR ("një" + "mbë" + "dhjetë") ;
+lin pot1to19 d = mkR (d.s ! teen) ;
+lin pot0as1 n = mkR (n.s ! unit) ;
+lin pot1 d = mkR (d.s ! ten) ;
+lin pot1plus d e = mkR ((d.s ! ten) ++ "e" ++ (e.s ! unit)) ;
+lin pot1as2 n = n ;
+lin pot2 d = mkR (bind (d.s ! unit) "qind") ;
+lin pot2plus d e = mkR ((bind (d.s ! unit) "qind") ++ "e" ++ e.s) ;
+lin pot2as3 n = {s = n.s };
+lin pot3 n = {s = n.s ++ "mijë" } ;
+lin pot3plus n m = {s = n.s ++ "mijë" ++ m.s} ;
+
+
+lincat Dig = {s : Str; n : Number} ;
+
+lin IDig d = d ** {tail = T1} ;
+
+    IIDig d i = {
+      s = d.s ++ spaceIf i.tail ++ i.s ;
+      n = Pl ;
+      tail = inc i.tail
+    } ;
+
+    D_0 = mkDig "0" Pl ;
+    D_1 = mkDig "1" Sg ;
+    D_2 = mkDig "2" Pl ;
+    D_3 = mkDig "3" Pl ;
+    D_4 = mkDig "4" Pl ;
+    D_5 = mkDig "5" Pl ;
+    D_6 = mkDig "6" Pl ;
+    D_7 = mkDig "7" Pl ;
+    D_8 = mkDig "8" Pl ;
+    D_9 = mkDig "9" Pl ;
+
+lin PosDecimal d = d ** {hasDot=False} ;
+    NegDecimal d = {s="-" ++ BIND ++ d.s;  hasDot=False; n = Pl} ;
+    IFrac d i = {
+        s=d.s ++
+          if_then_Str d.hasDot BIND (BIND++","++BIND) ++
+          i.s ;
+        hasDot=True;
+        n = Pl
+    } ;
+
+oper
+    mkDig : Str -> Number -> Dig = \s,n -> lin Dig {s=s; n=n} ;
+
+    spaceIf : DTail -> Str = \t -> case t of {
+      T3 => "" ;
+      _  => BIND
+      } ;
+
+}

src/albanian/PhraseSqi.gf

@@ -0,0 +1,14 @@
+concrete PhraseSqi of Phrase = CatSqi ** open Prelude, ResSqi in {
+
+  lin
+    PhrUtt pconj utt voc = {s = pconj.s ++ utt.s ++ voc.s} ;
+
+    UttS s = s ;
+    UttNP np = {s = np.s ! Nom} ;
+    UttInterj i = i ;
+
+    NoPConj = {s = []} ;
+
+    NoVoc = {s = []} ;
+
+}

src/albanian/ResSqi.gf

@@ -0,0 +1,261 @@
+resource ResSqi = ParamX-[Tense,Past,Pres] ** open Prelude in {
+
+oper Compl = {s : Str} ;
+
+param Species = Indef | Def ;
+param Case = Nom | Acc | Dat | Ablat ;
+param Gender = Masc | Fem ;
+
+param GenNum = GSg Gender | GPl ;
+oper Agr = {gn : GenNum; p : Person} ;
+
+oper Noun = {s: Species => Case => Number => Str; g: Gender} ; -- 3978
+oper mkNoun : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ : Str) -> Gender -> Noun =
+       \f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13,f14,f15,f16,g ->
+          { s = table {
+                  Indef => table {
+                             Nom => table {
+                                      Sg => f1 ;
+                                      Pl => f2
+                                    } ;
+                             Acc => table {
+                                      Sg => f3 ;
+                                      Pl => f4
+                                    } ;
+                             Dat => table {
+                                      Sg => f5 ;
+                                      Pl => f6
+                                    } ;
+                             Ablat => table {
+                                        Sg => f7 ;
+                                        Pl => f8
+                                      }
+                           } ;
+                  Def => table {
+                           Nom => table {
+                                    Sg => f9 ;
+                                    Pl => f10
+                                  } ;
+                           Acc => table {
+                                    Sg => f11 ;
+                                    Pl => f12
+                                  } ;
+                           Dat => table {
+                                    Sg => f13 ;
+                                    Pl => f14
+                                  } ;
+                           Ablat => table {
+                                      Sg => f15 ;
+                                      Pl => f16
+                                    }
+                         }
+                } ;
+            g = g
+          } ;
+
+
+oper Adj = {s: Case => Gender => Number => Str; clit: Bool} ; -- 462
+oper mkAdj : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ : Str) -> Bool -> Adj =
+       \f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13,f14,f15,f16,clit ->
+          { s = table {
+                  Nom => table {
+                           Masc => table {
+                                     Sg => f1 ;
+                                     Pl => f2
+                                   } ;
+                           Fem => table {
+                                    Sg => f3 ;
+                                    Pl => f4
+                                  }
+                         } ;
+                  Acc => table {
+                           Masc => table {
+                                     Sg => f5 ;
+                                     Pl => f6
+                                   } ;
+                           Fem => table {
+                                    Sg => f7 ;
+                                    Pl => f8
+                                  }
+                         } ;
+                  Dat => table {
+                           Masc => table {
+                                     Sg => f9 ;
+                                     Pl => f10
+                                   } ;
+                           Fem => table {
+                                    Sg => f11 ;
+                                    Pl => f12
+                                  }
+                         } ;
+                  Ablat => table {
+                             Masc => table {
+                                       Sg => f13 ;
+                                       Pl => f14
+                                     } ;
+                             Fem => table {
+                                      Sg => f15 ;
+                                      Pl => f16
+                                    }
+                           }
+                } ;
+            clit = clit
+          } ;
+
+
+param Tense = Pres | Past | Imperfect | Aorist ;
+oper Verb = {Indicative: Tense => Number => Person => Str; Imperative: Number => Str; participle: Str; pres_optative: Number => Person => Str; perf_optative: Number => Person => Str; pres_admirative: Number => Person => Str; imperf_admirative: Number => Person => Str} ; -- 758
+oper mkVerb : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ : Str) -> Verb =
+       \f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13,f14,f15,f16,f17,f18,f19,f20,f21,f22,f23,f24,f25,f26,f27,f28,f29,f30,f31,f32,f33,f34,f35,f36,f37,f38,f39,f40,f41,f42,f43,f44,f45,f46,f47,f48,f49,f50,f51 ->
+          { Indicative = table {
+                           Pres => table {
+                                     Sg => table {
+                                             P1 => f1 ;
+                                             P2 => f2 ;
+                                             P3 => f3
+                                           } ;
+                                     Pl => table {
+                                             P1 => f4 ;
+                                             P2 => f5 ;
+                                             P3 => f6
+                                           }
+                                   } ;
+                           Past => table {
+                                     Sg => table {
+                                             P1 => f7 ;
+                                             P2 => f8 ;
+                                             P3 => f9
+                                           } ;
+                                     Pl => table {
+                                             P1 => f10 ;
+                                             P2 => f11 ;
+                                             P3 => f12
+                                           }
+                                   } ;
+                           Aorist => table {
+                                       Sg => table {
+                                               P1 => f13 ;
+                                               P2 => f14 ;
+                                               P3 => f15
+                                             } ;
+                                       Pl => table {
+                                               P1 => f16 ;
+                                               P2 => f17 ;
+                                               P3 => f18
+                                             }
+                                     } ;
+                           Imperfect => table {
+                                          Sg => table {
+                                                  P1 => f19 ;
+                                                  P2 => f20 ;
+                                                  P3 => f21
+                                                } ;
+                                          Pl => table {
+                                                  P1 => f22 ;
+                                                  P2 => f23 ;
+                                                  P3 => f24
+                                                }
+                                        }
+                         } ;
+            Imperative = table {
+                           Sg => f25 ;
+                           Pl => f26
+                         } ;
+            participle = f27 ;
+            pres_optative = table {
+                              Sg => table {
+                                      P1 => f28 ;
+                                      P2 => f29 ;
+                                      P3 => f30
+                                    } ;
+                              Pl => table {
+                                      P1 => f31 ;
+                                      P2 => f32 ;
+                                      P3 => f33
+                                    }
+                            } ;
+            perf_optative = table {
+                              Sg => table {
+                                      P1 => f34 ;
+                                      P2 => f35 ;
+                                      P3 => f36
+                                    } ;
+                              Pl => table {
+                                      P1 => f37 ;
+                                      P2 => f38 ;
+                                      P3 => f39
+                                    }
+                            } ;
+            pres_admirative = table {
+                                Sg => table {
+                                        P1 => f40 ;
+                                        P2 => f41 ;
+                                        P3 => f42
+                                      } ;
+                                Pl => table {
+                                        P1 => f43 ;
+                                        P2 => f44 ;
+                                        P3 => f45
+                                      }
+                              } ;
+            imperf_admirative = table {
+                                  Sg => table {
+                                          P1 => f46 ;
+                                          P2 => f47 ;
+                                          P3 => f48
+                                        } ;
+                                  Pl => table {
+                                          P1 => f49 ;
+                                          P2 => f50 ;
+                                          P3 => f51
+                                        }
+                                }
+          } ;
+
+oper link_clitic : Species => Case => Gender => Number => Str =
+       table {
+         Indef => table {
+                    Nom => table {
+                             Masc => table {
+                                       Sg => "i" ;
+                                       Pl => "të"
+                                     } ;
+                             Fem => table {
+                                      Sg => "e" ;
+                                      Pl => "të"
+                                    }
+                           } ;
+                    _ => \\_,_ => "të"
+                  } ;
+         Def => table {
+                    Nom => table {
+                             Masc => table {
+                                       Sg => "i" ;
+                                       Pl => "e"
+                                     } ;
+                             Fem => table {
+                                      Sg => "e" ;
+                                      Pl => "e"
+                                    }
+                           } ;
+                    Acc => \\_,_ => "e" ;
+                    _   => table {
+                             Masc => \\_ => "të" ;
+                             Fem => table {
+                                      Sg => "së" ;
+                                      Pl => "të"
+                                    }
+                           }
+                  }
+          } ;
+
+oper genNum : Gender -> Number -> GenNum = \g,n ->
+       case n of {
+         Sg => GSg g ;
+         Pl => GPl
+       } ;
+
+     agrgP3 : Gender -> Number -> Agr = 
+       \g,n -> {gn=genNum g n; p=P3} ;
+
+}

src/albanian/StructuralSqi.gf

@@ -0,0 +1,19 @@
+concrete StructuralSqi of Structural = CatSqi ** open ResSqi, ParadigmsSqi in {
+
+lin i_Pron = mkPron "unë" "mua" "mua" "meje" "më" "më" (GSg Masc) P1 ;
+lin youSg_Pron = mkPron "ti" "ty" "ty" "teje" "të" "të" (GSg Masc) P2 ;
+lin he_Pron = mkPron "ai" "atë" "atij" "atij" "e" "i" (GSg Masc) P3 ;
+lin she_Pron = mkPron "ajo" "atë" "asaj" "asaj" "e" "i" (GSg Fem) P3 ;
+lin it_Pron = mkPron "ai" "atë" "atij" "atij" "e" "i" (GSg Masc) P3 ;
+lin we_Pron = mkPron "ne" "ne" "neve" "nesh" "na" "na" GPl P1 ;
+lin youPl_Pron = mkPron "ju" "ju" "juve" "jush" "ju" "ju" GPl P2 ;
+lin they_Pron = mkPron "ata" "ata" "atyre" "atyre" "i" "u" GPl P3 ;
+lin this_Quant = mkQuant "ky"    "këta"     "kjo"   "këto"
+                         "këtë"  "këtyre"   "këtë"  "këtyre"
+                         "këtij" "këtyre"   "kësaj" "këtyre"
+                         "këtij" "këtyre"   "kësaj" "këtyre" ;
+lin that_Quant = mkQuant "ai"   "ata"   "ajo"  "ato"
+                         "atë"  "ata"   "atë"  "ato"
+                         "atij" "atyre" "asaj" "atyre"
+                         "atij" "atyre" "asaj" "atyre" ;
+}

src/amharic/NumeralAmh.gf

@@ -109,11 +109,6 @@ lin pot3plus n m = {
       _  => BIND
       } ;
 
-    inc : DTail -> DTail = \t -> case t of {
-      T1 => T2 ;
-      T2 => T3 ;
-      T3 => T1
-      } ;
 ------------------ :) what a releif 
 
     mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c o  ;

src/amharic/ResAmh.gf

@@ -995,8 +995,8 @@ pronNP : (N,A,G,D : Str) -> PerNumGen -> NP = \N,A,G,D,png-> {
     {     
       s = \\c =>case c of
 		{
-		Gen|Dat => affix!c + word;
-		   _    => word + affix!c 
+		Gen|Dat => affix!c ++ Predef.BIND ++ word;
+		   _    => word ++ Predef.BIND ++ affix!c 
 		};
       a = {png = Per3 n Masc ; isPron = False };
       lock_NP = <>

src/ancient_greek/ResGrc.gf

@@ -18,7 +18,7 @@
 -- Author: Hans Leiß, LMU Munich, CIS
 
 
-resource ResGrc = ParamX - [Number,Sg,Pl,ImpForm,numImp,Tense,ImpF] 
+resource ResGrc = ParamX - [Number,Sg,Pl,ImpForm,numImp,Tense,ImpF,inc,DTail]
                   ** open Prelude, PhonoGrc, Predef in {
 flags 
   optimize = noexpand ;  -- optimize=all is impossible with addAccent

src/api/CombinatorsSco.gf

@@ -0,0 +1,15 @@
+--# -path=.:alltenses:prelude
+
+resource CombinatorsSco = Combinators - [ appCN, appCNc ] with 
+  (Cat = CatSco),
+  (Structural = StructuralSco),
+  (Noun = NounSco),
+  (Constructors = ConstructorsSco) ** 
+  {
+  	oper
+	appCN : CN -> NP -> NP
+           = \cn,x -> mkNP the_Art (PossNP cn x) ;
+    appCNc : CN -> [NP] -> NP
+           = \cn,xs -> let np : NP = mkNP and_Conj xs
+                       in mkNP the_Art (PossNP cn np) ; 
+  }

src/api/ConstructorsSco.gf

@@ -0,0 +1,3 @@
+--# -path=.:alltenses:prelude
+
+resource ConstructorsSco = Constructors with (Grammar = GrammarSco) ;

src/api/SymbolicSco.gf

@@ -0,0 +1,5 @@
+--# -path=.:../english:../common:../abstract:../prelude
+
+resource SymbolicSco = Symbolic with 
+  (Symbol = SymbolSco),
+  (Grammar = GrammarSco) ;

src/api/SyntaxSco.gf

@@ -0,0 +1,5 @@
+--# -path=.:alltenses:prelude
+
+instance SyntaxSco of Syntax = 
+  ConstructorsSco, CatSco, StructuralSco, CombinatorsSco ;
+

src/api/TryDan.gf

@@ -1,3 +1,16 @@
 --# -path=.:../danish:../scandinavian:../common:../abstract:../prelude
 
-resource TryDan = SyntaxDan, LexiconDan, ParadigmsDan - [mkAdv] ;
+resource TryDan = SyntaxDan-[mkAdN], LexiconDan, ParadigmsDan - [mkAdv,mkAdN] **
+  open (P = ParadigmsDan) in {
+
+oper
+  mkAdv = overload SyntaxDan {
+    mkAdv : Str -> Adv = P.mkAdv ;
+  } ;
+
+  mkAdN = overload {
+    mkAdN : CAdv -> AdN = SyntaxDan.mkAdN ;
+    mkAdN : Str -> AdN = P.mkAdN ;
+  } ;
+
+}

src/api/TryEus.gf

@@ -1,3 +1,16 @@
 --# -path=.:../basque:../common:../abstract:../prelude
 
-resource TryEus = SyntaxEus, LexiconEus, ParadigmsEus - [mkAdv,mkAdN,mkDet,mkQuant,mkPConj] ;
+resource TryEus = SyntaxEus-[mkVoc], LexiconEus, ParadigmsEus - [mkAdv,mkAdN,mkDet,mkQuant,mkPConj,mkVoc] **
+  open (P = ParadigmsEus) in {
+
+oper
+  mkAdv = overload SyntaxEus {
+    mkAdv : Str -> Adv = P.mkAdv ;
+  } ;
+
+  mkVoc = overload {
+    mkVoc : NP -> Voc = SyntaxEus.mkVoc ;
+    mkVoc : Str -> Voc = P.mkVoc ;
+  } ;
+
+}

src/api/TryGer.gf

@@ -1,3 +1,3 @@
 --# -path=.:../german:../common:../abstract:../prelude
 
-resource TryGer = SyntaxGer, ExtraGer, LexiconGer, ParadigmsGer - [mkAdv], MakeStructuralGer ;
+resource TryGer = SyntaxGer, ExtraGer, LexiconGer, ParadigmsGer - [mkAdv,mkIAdv], MakeStructuralGer ;

src/api/TryGre.gf

@@ -1,17 +1,21 @@
 --# -path=.:../greek:../common:../abstract:../prelude
 
-resource TryGre = SyntaxGre, LexiconGre, ParadigmsGre ;
-
-{-
--[mkAdv, mkDet,mkQuant]** 
+resource TryGre = SyntaxGre-[mkAdN,mkVoc], LexiconGre, ParadigmsGre - [mkAdN,mkAdv,mkVoc] **
   open (P = ParadigmsGre) in {
 
- oper
-
+oper
   mkAdv = overload SyntaxGre {
     mkAdv : Str -> Adv = P.mkAdv ;
   } ;
 
-}
+  mkVoc = overload {
+    mkVoc : NP -> Voc = SyntaxGre.mkVoc ;
+    mkVoc : Str -> Voc = P.mkVoc ;
+  } ;
 
--}
+  mkAdN = overload {
+    mkAdN : CAdv -> AdN = SyntaxGre.mkAdN ;
+    mkAdN : Str -> AdN = P.mkAdN ;
+  } ;
+
+}

src/api/TryHun.gf

@@ -1,3 +1,17 @@
 --# -path=.:../hungarian:../common:../abstract:../prelude
 
-resource TryHun = SyntaxHun, LexiconHun, ParadigmsHun - [mkAdv] ;
+resource TryHun = SyntaxHun-[mkAdN], LexiconHun, ParadigmsHun - [mkAdv,mkAdN] **
+  open (P = ParadigmsHun) in {
+
+oper
+  mkAdv = overload SyntaxHun {
+    mkAdv : Str -> Adv = P.mkAdv ;
+  } ;
+
+  mkAdN = overload {
+    mkAdN : CAdv -> AdN = SyntaxHun.mkAdN ;
+    mkAdN : Str -> AdN = P.mkAdN ;
+  } ;
+
+}
+

src/api/TryIce.gf

@@ -1,3 +1,12 @@
 --# -path=.:../icelandic:../common:../abstract:../prelude
 
-resource TryIce = SyntaxIce, LexiconIce, ParadigmsIce - [mkAdv,mkAdN,mkOrd] ;
+resource TryIce = SyntaxIce-[mkVoc], LexiconIce, ParadigmsIce - [mkAdv,mkAdN,mkOrd,mkVoc] **
+  open (P = ParadigmsIce) in {
+
+oper
+  mkVoc = overload {
+    mkVoc : NP -> Voc = SyntaxIce.mkVoc ;
+    mkVoc : Str -> Voc = P.mkVoc ;
+  } ;
+
+}

src/api/TryNno.gf

@@ -1,3 +1,16 @@
 --# -path=.:../nynorsk:../scandinavian:../common:../abstract:../prelude
 
-resource TryNno = SyntaxNno, LexiconNno, ParadigmsNno - [mkAdv] ;
+resource TryNno = SyntaxNno-[mkAdN], LexiconNno, ParadigmsNno - [mkAdv,mkAdN] **
+  open (P = ParadigmsNno) in {
+
+oper
+  mkAdv = overload SyntaxNno {
+    mkAdv : Str -> Adv = P.mkAdv ;
+  } ;
+
+  mkAdN = overload {
+    mkAdN : CAdv -> AdN = SyntaxNno.mkAdN ;
+    mkAdN : Str -> AdN = P.mkAdN ;
+  } ;
+
+}

src/api/TryNor.gf

@@ -1,3 +1,16 @@
 --# -path=.:../norwegian:../scandinavian:../common:../abstract:../prelude
 
-resource TryNor = SyntaxNor, LexiconNor, ParadigmsNor - [mkAdv] ;
+resource TryNor = SyntaxNor-[mkAdN], LexiconNor, ParadigmsNor - [mkAdv,mkAdN] **
+  open (P = ParadigmsNor) in {
+
+oper
+  mkAdv = overload SyntaxNor {
+    mkAdv : Str -> Adv = P.mkAdv ;
+  } ;
+
+  mkAdN = overload {
+    mkAdN : CAdv -> AdN = SyntaxNor.mkAdN ;
+    mkAdN : Str -> AdN = P.mkAdN ;
+  } ;
+
+}

src/api/TrySco.gf

@@ -0,0 +1,22 @@
+--# -path=.:../english:../common:../abstract:../prelude
+
+resource TrySco = SyntaxSco-[mkAdN], LexiconSco, ParadigmsSco - [mkAdv,mkAdN,mkOrd,mkQuant,mkVoc] **
+  open (P = ParadigmsEng) in {
+
+oper
+
+  mkAdv = overload SyntaxSco {
+    mkAdv : Str -> Adv = P.mkAdv ;
+  } ;
+
+  mkAdN = overload {
+    mkAdN : CAdv -> AdN = SyntaxSco.mkAdN ;
+    mkAdN : Str -> AdN = P.mkAdN ;
+  } ;
+
+  mkOrd = overload SyntaxSco {
+    mkOrd : Str -> Ord = P.mkOrd ;
+  } ;
+
+
+}

src/arabic/CatAra.gf

@@ -54,7 +54,7 @@ concrete CatAra of Cat = CommonX - [Utt]  ** open ResAra, Prelude, ParamX in {
     Card = ResAra.NumOrdCard ;
     Predet = ResAra.Predet ;
 
-    Det = ResAra.Det ;
+    DAP, Det = ResAra.Det ;
 --  {s : Species => Gender => Case => Str ;
 --   d : State; n : Size; isNum : Bool } ;
     Quant = ResAra.Quant ;
@@ -92,7 +92,8 @@ concrete CatAra of Cat = CommonX - [Utt]  ** open ResAra, Prelude, ParamX in {
     N = ResAra.Noun ;
     N2 = ResAra.Noun2 ;
     N3 = ResAra.Noun3 ;
-    GN, SN, LN, PN = {s : Case => Str; g : Gender; h : Species} ;
+    GN, SN, PN = {s : Case => Str; g : Gender; h : Species} ;
+    LN = ResAra.NP ;
 
 linref
 

src/arabic/ConstructionAra.gf

@@ -31,15 +31,15 @@ lin
 
   monthAdv january =
     let january_CN : CN = mkCN month_Timeunit (mkNP (mkPN january)) ;
-        january_NP : NP = R.emptyNP **
+        january_NP : NP = lin NP R.emptyNP **
            {s = \\c => R.cn2str january_CN R.Sg R.Const c ;
             a = {pgn = R.Per3 january_CN.g R.Sg ; isPron = False}} ;
-     in SyntaxAra.mkAdv R.biPrep january_NP ;
+     in SyntaxAra.mkAdv ParadigmsAra.biPrep january_NP ;
 
   yearAdv y = SyntaxAra.mkAdv in_Prep y ;
 
   -- dummy
-  dayMonthAdv d m  = SyntaxAra.mkAdv on_Prep (mkNP d) ; -- on 17 May
+  dayMonthAdv d m  = SyntaxAra.mkAdv on_Prep (mkNP m) ; -- on 17 May
   monthYearAdv m y = SyntaxAra.mkAdv on_Prep (mkNP m) ; -- in May 2012
   dayMonthYearAdv d m y = SyntaxAra.mkAdv on_Prep y ; -- on 17 May 2013
 
@@ -51,7 +51,7 @@ lin
     let ap = mkAP a in ap ** {
       s = \\s,g,n,d,c =>
            ap.s ! s ! g ! n ! d ! c
-        ++ (mkAdv R.biPrep (mkNP amount_N)).s
+        ++ (mkAdv ParadigmsAra.biPrep (mkNP amount_N)).s
         ++ (mkNP card cn).s ! R.Bare ---- ? /IL
       } ;
 
@@ -60,26 +60,26 @@ oper
   amount_N : N = mkN "مِقْدَار" "مَقَادِير" masc nohum ;
 
   -- hack used in the name constructions
-  toNP : Bool -> NP -> NP = \b -> if_then_else NP b R.emptyNP ;
+  toNP : Bool -> NP -> NP = \b -> if_then_else NP b (lin NP R.emptyNP) ;
 
 lin
   -- : NP -> NP -> Cl
   have_name_Cl np nm =
-    let subjPron : Pron = R.np2pron np ;
+    let subjPron : Pron = lin Pron (R.np2pron np) ;
         me : NP = toNP np.a.isPron np ;
         myName : NP = E.ApposNP me (mkNP (mkDet subjPron) L.name_N) ;
      in mkCl myName nm ;
 
   -- : NP -> QCl
   what_name_QCl np =
-    let subjPron : Pron = R.np2pron np ;
+    let subjPron : Pron = lin Pron (R.np2pron np) ;
         me : R.NP = toNP np.a.isPron np ;
         myName : NP = E.ApposNP me (mkNP (mkDet subjPron) L.name_N) ;
-        what_IP : R.IP = R.mkIP "مَا هُوَ" R.Sg ;
+        what_IP : IP = lin IP (R.mkIP "مَا هُوَ" R.Sg) ;
      in mkQCl what_IP myName ;
 
   how_old_QCl np =
-    let subjPron : Pron = R.np2pron np ;
+    let subjPron : Pron = lin Pron (R.np2pron np) ;
         me : R.NP = toNP np.a.isPron np ;
         age_N = mkN "عُمر" ;
         myAge : NP = E.ApposNP me (mkNP (mkDet subjPron) L.name_N) ;

src/arabic/DocumentationAra.gf

@@ -1,4 +1,4 @@
---# -path=.:../abstract:../common
+	--# -path=.:../abstract:../common
 
 -- documenting Arabic inflection
 ---- so far with English titles and tags, AR 2024-01-31
@@ -32,7 +32,7 @@ lin
          )
     } ;
 
-  InflectionPN, InflectionLN, InflectionGN, InflectionSN = \pn -> { ---- TODO: special for LN, GN, SN
+  InflectionPN, InflectionGN, InflectionSN = \pn -> { ---- TODO: special for LN, GN, SN
     t  = "pn" ;
     s1 = heading1 ("Proper Name" ++
                     case pn.g of {

src/arabic/ExtendAra.gf

@@ -8,7 +8,7 @@ concrete ExtendAra of Extend =
     VPS, MkVPS, PredVPS, BaseVPS, ConsVPS, ConjVPS,
     EmbedSSlash, AdjAsNP, GerundNP,
     PassVPSlash, ---- bogus implementation, see below
-    CompoundN
+    CompoundN, UseDAP, UseDAPMasc, UseDAPFem
 ]
   with (Grammar=GrammarAra)
   ** open
@@ -105,4 +105,31 @@ lin
       s2 = \\n, s, c => b.s2 ! n ! Const ! c ++ a.s2 ! n ! s ! c
       } ;
 
+lin UseDAP dap = case dap.isEmpty of {
+      True => case <dap.d,dap.n> of {  -- if the s field is empty, make up some other determiner
+                <Def,One>   => it_Pron ;
+                <Def,_>     => they_Pron ;
+                <Indef,One> => emptyNP ** {s = someSg_Det.s ! NoHum ! Masc} ;
+                _           => emptyNP ** {s = somePl_Det.s ! NoHum ! Masc}
+              } ;
+      False => emptyNP ** {s = dap.s ! NoHum ! Masc} } ;
+
+lin UseDAPMasc dap = case dap.isEmpty of {
+      True => case <dap.d,dap.n> of {  -- if the s field is empty, make up some other determiner
+                <Def,One>   => it_Pron ;
+                <Def,_>     => theyMasc_Pron ;
+                <Indef,One> => emptyNP ** {s = someSg_Det.s ! NoHum ! Masc} ;
+                _           => emptyNP ** {s = somePl_Det.s ! NoHum ! Masc}
+              } ;
+      False => emptyNP ** {s = dap.s ! NoHum ! Masc} } ;
+
+lin UseDAPFem dap = case dap.isEmpty of {
+      True => case <dap.d,dap.n> of {  -- if the s field is empty, make up some other determiner
+                <Def,One>   => it_Pron ;
+                <Def,_>     => theyFem_Pron ;
+                <Indef,One> => emptyNP ** {s = someSg_Det.s ! NoHum ! Fem} ;
+                _           => emptyNP ** {s = somePl_Det.s ! NoHum ! Fem}
+              } ;
+      False => emptyNP ** {s = dap.s ! NoHum ! Fem} } ;
+
 }

src/arabic/LexiconAra.gf

@@ -23,7 +23,7 @@ flags
   beautiful_A  = sndA "جمل" "فَعِيل" ;
   become_VA    = mkVA (v4 "صبح") ;
   beer_N       = sdfN "بير" "فِعلة" Fem NoHum ;
-  beg_V2V      = mkV2V (mkVV (v5 "وسل")) noPrep ;
+  beg_V2V      = mkV2V (mkVV (v5 "وسل")) ParadigmsAra.noPrep ;
   big_A        = sndA "كبر" "فَعِيل" ;
   bike_N       = sdfN "درج" "فَعّالة" Fem NoHum ;
   bird_N       = brkN "طير" "فَعل" "فُعُول" Masc NoHum;
@@ -72,7 +72,7 @@ flags
   door_N       = brkN "بوب" "فاع" "أَفعَال" Masc NoHum ;
   drink_V2     = dirV2 (regV "شَرِب") ;
 --  drink_V2     = dirV2 (v1 "شرب" i a) ;
-  easy_A2V     = mkA2 (sndA "سهل" "فَعل") liPrep ;
+  easy_A2V     = mkA2 (sndA "سهل" "فَعل") ParadigmsAra.liPrep ;
   eat_V2       = dirV2 (mkV "ءكل" FormI) ;
   empty_A      = sndA "فرغ" "فاعِل" ;
   enemy_N      = brkN "عدو" "فَعُلّ" "أَفعَاء" Masc Hum ;
@@ -202,7 +202,7 @@ flags
   switch8off_V2 = dirV2 (v4 "طفء") ;
   switch8on_V2 = dirV2 (v4 "شعل") ;
   table_N      = sdfN "طول" "فاعِلة" Fem NoHum ;
-  talk_V3      = mkV3 (v5 "حدث") liPrep (mkPrep "عَن") ;
+  talk_V3      = mkV3 (v5 "حدث") ParadigmsAra.liPrep (mkPrep "عَن") ;
   teacher_N    = sdmN "علم" "مُفَعِّل" Masc Hum ; --mucal~imö
   teach_V2     = dirV2 (v2 "علم") ;
   television_N = mkN (sndf "تِلِفِزيُون") Masc NoHum ;

src/arabic/MorphoAra.gf

@@ -70,6 +70,8 @@ oper
           _                 => "لِ"
         }) Dat ;
   biPrep : Preposition = mkPrefix "بِ" ;
+  kaPrep : Preposition = mkPrefix "كَ" ;
+
   accPrep : Preposition = mkPreposition [] Acc ; -- default object case in VP
   genPrep : Preposition = mkPreposition [] Gen ; -- default object case in N2
 

src/arabic/NamesAra.gf

@@ -9,11 +9,10 @@ lin FullName gn sn = emptyNP ** {
       a = {pgn = Per3 gn.g Sg ; isPron = False} ;
       } ;
 
-lin UseLN pn = emptyNP ** {
-      s = pn.s ;
-      a = {pgn = Per3 pn.g Sg ; isPron = False} ;
-      } ;
+lin UseLN ln = ln ;
 
-lin InLN n = A.PrepNP S.in_Prep (N.UsePN n) ; ---- TODO: alternative prepositions
+lin PlainLN ln = ln ;
+
+lin InLN n = A.PrepNP S.in_Prep n ; ---- TODO: alternative prepositions
 
 }

src/arabic/NounAra.gf

@@ -237,6 +237,11 @@ lin
              }
     };
 
-  -- : CN -> NP -> CN ;     -- glass of wine
-  --PartNP
+  DetDAP d = d ;
+
+  QuantityNP n m = emptyNP ** {
+    s = \\c => preOrPost m.isPre m.s n.s ;
+    a = { pgn = agrP3 NoHum Masc (sizeToNumber n.n);
+          isPron = False }
+  };
 }

src/arabic/ParadigmsAra.gf

@@ -30,6 +30,7 @@ resource ParadigmsAra = open
   ResAra,
   OrthoAra,
   (A=AdjectiveAra),
+  (N=NounAra),
   CatAra
   in {
 
@@ -97,12 +98,17 @@ resource ParadigmsAra = open
 
   mkLN = overload {
     mkLN : Str -> LN  -- Predictable LN from a Str: fem hum if ends in ة, otherwise masc hum.
-     = \s -> lin LN (smartPN s) ;
+     = \s -> lin LN (N.UsePN (smartPN s)) ;
+    mkLN : Str -> Gender -> LN
+     = \s, g -> lin LN (N.UsePN (smartPN s ** {g = g})) ;
     mkLN : N -> LN    -- Make a LN out of N. The LN is in construct state.
-     = \n -> lin LN (n ** {
-          s = \\c => n.s ! Sg ! Const ! c
-                  ++ n.s2 ! Sg ! Def ! c -- NB this hack works for idaafa constructions (if you used mkN : N -> N -> N), but wrong for mkN : N -> A -> N. /IL
-        }) ;
+     = \n -> lin LN (N.MassNP (N.UseN n)) ;
+     ----(n ** { ---- cannot get this to compile AR 2024-04-18
+         ---- s = \\c => n.s ! Sg ! Const ! c
+             ----     ++ n.s2 ! Sg ! Def ! c -- NB this hack works for idaafa constructions (if you used mkN : N -> N -> N), but wrong for mkN : N -> A -> N. /IL
+----        }))) ;
+    mkLN : NP -> LN
+      = \np -> lin LN np ;
   } ;
 
 --3 Relational nouns
@@ -147,7 +153,7 @@ resource ParadigmsAra = open
 
   nisbaA : Str -> Adj ; -- Forms relative adjectives with the suffix ِيّ. Takes either the stem and adds يّ, or the whole word ending in يّ and just adds declension.
 
-  idaafaA : N -> A -> A ; -- Forms adjectives of type غَيْرُ طَيِّبٍ 'not good'. Noun is in construct state but inflects in case. Adjective is in genitive, but inflects in gender, number and state.
+  idaafaA : N -> A -> A ; -- Forms adjectives of type غَيْرُ لَذيذٍ 'not tasty'. Noun is in construct state but inflects in case. Adjective is in genitive, but inflects in gender, number and state.
 
   degrA : (masc,fem,plur : Str) -> A ; -- Adjective where masculine singular is also the comparative form. Indeclinable singular, basic triptote declension for dual and plural.
 
@@ -196,6 +202,7 @@ resource ParadigmsAra = open
 
   liPrep : Prep ; -- The preposition لِ, binding to its head. Vowel assimilation and def. article elision implemented.
   biPrep : Prep ; -- The preposition بِ, binding to its head.
+  kaPrep : Prep ; -- The preposition كَ, binding to its head.
   noPrep : Prep ; -- No preposition at all, "complement case" is nominative.
 
 --2 Conjunctions
@@ -206,6 +213,10 @@ resource ParadigmsAra = open
     mkConj : Str -> Str -> Number -> Conj ; -- either, or, sg
   } ;
 
+--2 Measurement Units
+
+  mkMU : Str -> MU = \s -> lin MU {s=s; isPre=False} ;
+
 --2 Verbs
 
 -- Overloaded operations
@@ -365,6 +376,7 @@ resource ParadigmsAra = open
   noPrep = lin Prep ResAra.noPrep ;
   biPrep = lin Prep ResAra.biPrep ;
   liPrep = lin Prep ResAra.liPrep ;
+  kaPrep = lin Prep ResAra.kaPrep ;
 
   casePrep : Case -> Prep = \c -> lin Prep {s=[]; c=c; binds=False} ;
 
@@ -802,7 +814,7 @@ resource ParadigmsAra = open
 
   dirV3 = overload {
     dirV3 : V -> Prep -> V3 = \v,p -> mkV3 v (casePrep acc) p ;
-    dirV3 : V -> Str -> V3 = \v,s -> mkV3 v (casePrep acc) (mkPreposition s)
+    dirV3 : V -> Str -> V3 = \v,s -> mkV3 v (casePrep acc) (mkPrep s)
     } ;
 
   dirdirV3 v = dirV3 v (casePrep acc) ;
@@ -863,7 +875,7 @@ resource ParadigmsAra = open
   mkAS,
   mkAV = \a -> a ;
   mkA2S,
-  mkA2V = \a,p -> prepA2 a (mkPreposition p) ;
+  mkA2V = \a,p -> lin A (prepA2 a (mkPreposition p)) ;
 
 
 
@@ -939,25 +951,25 @@ oper
     wmkA : {masc_sg, masc_pl, root, sg_patt : Str} -> A
       = \r -> mkA r.root r.sg_patt ;
     wmkA : {masc_sg, fem_sg, masc_pl, fem_pl, root, pl_patt : Str} -> A
-      = \r -> mascFemAdj r.masc_sg r.fem_sg ;
+      = \r -> mascFemA r.masc_sg r.fem_sg ;
     wmkA : {masc_sg, fem_sg, masc_pl, fem_pl, root : Str} -> A
-      = \r ->  mascFemAdj r.masc_sg r.fem_sg ;
+      = \r -> mascFemA r.masc_sg r.fem_sg ;
     wmkA : {masc_sg, fem_sg, root : Str} -> A
       = \r -> mkA r.root ; ----
     wmkA : {masc_sg, fem_sg, masc_pl, fem_pl, pl_patt : Str} -> A
-      = \r ->  mascFemAdj r.masc_sg r.fem_sg ;
+      = \r -> mascFemA r.masc_sg r.fem_sg ;
     wmkA : {masc_sg : Str; fem_sg : Str; fem_pl : Str} -> A
-      = \r ->  mascFemAdj r.masc_sg r.fem_sg ;
+      = \r -> mascFemA r.masc_sg r.fem_sg ;
     wmkA : {masc_sg : Str; fem_sg : Str; root : Str ; sg_patt : Str} -> A
       = \r -> mkA r.root r.sg_patt ;
     wmkA : {masc_sg : Str; fem_sg : Str} -> A
-      = \r ->  mascFemAdj r.masc_sg r.fem_sg ;
+      = \r -> mascFemA r.masc_sg r.fem_sg ;
     wmkA : {masc_sg : Str; masc_pl : Str; fem_sg : Str; fem_pl : Str} -> A
-      = \r ->  mascFemAdj r.masc_sg r.fem_sg ;
+      = \r -> mascFemA r.masc_sg r.fem_sg ;
     wmkA : {masc_sg : Str; masc_pl : Str; fem_sg : Str; root : Str} -> A
       = \r -> mkA r.root ;
     wmkA : {masc_sg : Str; masc_pl : Str; fem_sg : Str} -> A
-      = \r ->  mascFemAdj r.masc_sg r.fem_sg ;
+      = \r -> mascFemA r.masc_sg r.fem_sg ;
     wmkA : {masc_sg : Str; masc_pl : Str; root : Str} -> A
       = \r -> mkA r.root ;
     wmkA : {masc_sg : Str; masc_pl, pl_patt : Str; root : Str} -> A

src/arabic/SentenceAra.gf

@@ -71,4 +71,5 @@ concrete SentenceAra of Sentence = CatAra ** open
     UseSlash t p cls = UseCl t p (complClSlash cls) ;
 
     AdvS adv s = s ** {s = \\o => adv.s ++ s.s ! o} ;
+    ExtAdvS adv s = s ** {s = \\o => adv.s ++ s.s ! o} ;
 }

src/arabic/StructuralAra.gf

@@ -124,7 +124,7 @@ concrete StructuralAra of Structural = CatAra **
   youPl_Pron = youPlMasc_Pron ;
   youPol_Pron = youPlFem_Pron ; -- arbitrary?
 
-  have_V2 = mkV2 ladaa_V (casePrep nom) ; -- "X has Y" literally "Y<nom> is on X<nom>"
+  have_V2 = mkV2 (lin V ladaa_V) (casePrep nom) ; -- "X has Y" literally "Y<nom> is on X<nom>"
   --have_V2 = dirV2 (regV "يَملِك") ; -- "X<nom> owns/possesses Y<acc>"
 
   lin language_title_Utt = {s = \\_ => "العربية"} ;

src/armenian/AdjectiveHye.gf

@@ -0,0 +1,4 @@
+concrete AdjectiveHye of Adjective = CatHye ** {
+lin
+  PositA a = a ;
+}

src/armenian/AllHye.gf

@@ -0,0 +1,4 @@
+concrete AllHye of AllHyeAbs =
+  LangHye
+  **
+    {} ;

src/armenian/AllHyeAbs.gf

@@ -0,0 +1,3 @@
+abstract AllHyeAbs =
+  Lang
+  ** {}

src/armenian/CatHye.gf

@@ -0,0 +1,16 @@
+concrete CatHye of Cat = CommonX ** open ResHye in {
+
+lincat V = Verb ;
+lincat VV,VS,VQ,VA = Verb ;
+lincat V2 = Verb ** {c2 : Compl} ;
+lincat V3,V2A,V2S,V2Q,V2V = Verb ** {c2,c3 : Compl} ;
+lincat N = Noun ;
+lincat N2 = Noun ** {c2 : Compl} ;
+lincat N3 = Noun ** {c2,c3 : Compl} ;
+lincat CN = Noun ;
+lincat A = Adj ;
+lincat A2 = Adj ** {c2 : Compl} ;
+lincat AP = Adj ;
+lincat Prep = Compl ;
+
+}

src/armenian/DocumentationHye.gf

@@ -0,0 +1,133 @@
+concrete DocumentationHye of Documentation = CatHye ** open
+  ResHye, Prelude, HTML in {
+
+lincat
+  Inflection = {t : Str; s1,s2,s3 : Str} ;
+  Definition = {s : Str} ;
+  Document   = {s : Str} ;
+  Tag        = {s : Str} ;
+
+lin
+  InflectionV,InflectionV2,InflectionV2A,InflectionV2Q,InflectionV2S,InflectionV2V,InflectionV3,InflectionVA,InflectionVQ,InflectionVS,InflectionVV = \x -> {
+      t="v" ;
+      s1="" ;
+      s2=heading1 "Infinitive" ++
+         paragraph (x.s) ++
+         heading1 "Converb" ++
+         frameTable (
+           tr (th "Imperfective" ++ td (x.Converb.Imperfective)) ++
+           tr (th "Simultaneous" ++ td (x.Converb.Simultaneous)) ++
+           tr (th "Perfective" ++ td (x.Converb.Perfective)) ++
+           tr (th "Futute I" ++ td (x.Converb.FutCon1)) ++
+           tr (th "Futute II" ++ td (x.Converb.FutCon2)) ++
+           tr (th "Connegative" ++ td (x.Converb.Negative))) ++
+        heading1 "Passive" ++
+        paragraph x.Passive ++
+        heading1 "Participle" ++
+        frameTable (
+           tr (th "Resultative" ++ td (x.Participle ! Resultative)) ++
+           tr (th "Subject" ++ td (x.Participle ! Subject))) ++
+         heading1 "Past" ++
+         frameTable (
+           tr (th "" ++ th "Sg" ++ th "Pl") ++
+           tr (th "P1" ++ td (x.Past ! P1 ! Sg) ++ td (x.Past ! P1 ! Pl)) ++
+           tr (th "P2" ++ td (x.Past ! P2 ! Sg) ++ td (x.Past ! P2 ! Pl)) ++
+           tr (th "P3" ++ td (x.Past ! P3 ! Sg) ++ td (x.Past ! P3 ! Pl))) ++
+        heading1 "Subjunctive" ++
+        frameTable (
+           tr (intagAttr "th" "colspan=\"2\"" "" ++ th "Sg" ++ th "Pl") ++ 
+           tr (intagAttr "th" "rowspan=\"3\"" "Perfect" ++
+               th "P1" ++ td (x.Subjunctive ! Perfect ! P1 ! Sg) ++ td (x.Subjunctive ! Perfect ! P1 ! Pl)) ++
+           tr (th "P2" ++ td (x.Subjunctive ! Perfect ! P2 ! Sg) ++ td (x.Subjunctive ! Perfect ! P2 ! Pl)) ++
+           tr (th "P3" ++ td (x.Subjunctive ! Perfect ! P3 ! Sg) ++ td (x.Subjunctive ! Perfect ! P3 ! Pl)) ++
+           tr (intagAttr "th" "rowspan=\"3\"" "Non_Past" ++
+               th "P1" ++ td (x.Subjunctive ! Non_Past ! P1 ! Sg) ++ td (x.Subjunctive ! Non_Past ! P1 ! Pl)) ++
+           tr (th "P2" ++ td (x.Subjunctive ! Non_Past ! P2 ! Sg) ++ td (x.Subjunctive ! Non_Past ! P2 ! Pl)) ++
+           tr (th "P3" ++ td (x.Subjunctive ! Non_Past ! P3 ! Sg) ++ td (x.Subjunctive ! Non_Past ! P3 ! Pl))) ++
+         heading1 "Conditional" ++
+         frameTable (           
+           tr (intagAttr "th" "colspan=\"2\"" "" ++ th "Sg" ++ th "Pl") ++
+           tr (intagAttr "th" "rowspan=\"3\"" "Perfect" ++
+               th "P1" ++ td (x.Conditional ! Perfect ! P1 ! Sg) ++ td (x.Conditional ! Perfect ! P1 ! Pl)) ++
+           tr (th "P2" ++ td (x.Conditional ! Perfect ! P2 ! Sg) ++ td (x.Conditional ! Perfect ! P2 ! Pl)) ++
+           tr (th "P3" ++ td (x.Conditional ! Perfect ! P3 ! Sg) ++ td (x.Conditional ! Perfect ! P3 ! Pl)) ++
+           tr (intagAttr "th" "rowspan=\"4\"" "Non_Past" ++ 
+               th "P1" ++ td (x.Conditional ! Non_Past ! P1 ! Sg) ++ td (x.Conditional ! Non_Past ! P1 ! Pl)) ++
+           tr (th "P2" ++ td (x.Conditional ! Non_Past ! P2 ! Sg) ++ td (x.Conditional ! Non_Past ! P2 ! Pl)) ++
+           tr (th "P3" ++ td (x.Conditional ! Non_Past ! P3 ! Sg) ++ td (x.Conditional ! Non_Past ! P3 ! Pl))) ++
+         heading1 "Imperative" ++
+         frameTable (
+           tr (th "Sg" ++ th "Pl") ++
+           tr (td (x.Imperative_Jussive ! Sg) ++ td (x.Imperative_Jussive ! Pl))) ;
+      s3=[]
+    } ;
+lin
+  InflectionN,InflectionN2,InflectionN3 = \x -> {
+      t="n" ;
+      s1="" ;
+      s2=frameTable (
+           tr (th "" ++ th "Sg" ++ th "Pl") ++
+           tr (th "Nom" ++ td (x.s ! Nom ! Sg) ++ td (x.s ! Nom ! Pl)) ++
+           tr (th "Dat" ++ td (x.s ! Dat ! Sg) ++ td (x.s ! Dat ! Pl)) ++
+           tr (th "Ablat" ++ td (x.s ! Ablat ! Sg) ++ td (x.s ! Ablat ! Pl)) ++
+           tr (th "Instr" ++ td (x.s ! Instr ! Sg) ++ td (x.s ! Instr ! Pl)) ++
+           tr (th "Loc"   ++ td (x.s ! Loc ! Sg) ++ td (x.s ! Loc ! Pl)) ++
+           tr (intagAttr "th" "colspan=\"3\"" "definite forms") ++
+           tr (th "Nom" ++ td (x.def_nom ! Sg) ++ td (x.def_nom ! Pl)) ++
+           tr (th "Dat" ++ td (x.def_dat ! Sg) ++ td (x.def_dat ! Pl)) ++
+           tr (intagAttr "th" "colspan=\"3\"" "1st person possessive forms") ++
+           tr (th "Nom" ++ td (x.poss1 ! Nom ! Sg) ++ td (x.poss1 ! Nom ! Pl)) ++
+           tr (th "Dat" ++ td (x.poss1 ! Dat ! Sg) ++ td (x.poss1 ! Dat ! Pl)) ++
+           tr (th "Ablat" ++ td (x.poss1 ! Ablat ! Sg) ++ td (x.poss1 ! Ablat ! Pl)) ++
+           tr (th "Instr" ++ td (x.poss1 ! Instr ! Sg) ++ td (x.poss1 ! Instr ! Pl)) ++
+           tr (th "Loc" ++ td (x.poss1 ! Loc ! Sg) ++ td (x.poss1 ! Loc ! Pl)) ++
+           tr (intagAttr "th" "colspan=\"3\"" "2nd person possessive forms") ++
+           tr (th "Nom" ++ td (x.poss2 ! Nom ! Sg) ++ td (x.poss2 ! Nom ! Pl)) ++
+           tr (th "Dat" ++ td (x.poss2 ! Dat ! Sg) ++ td (x.poss2 ! Dat ! Pl)) ++
+           tr (th "Ablat" ++ td (x.poss2 ! Ablat ! Sg) ++ td (x.poss2 ! Ablat ! Pl)) ++
+           tr (th "Instr" ++ td (x.poss2 ! Instr ! Sg) ++ td (x.poss2 ! Instr ! Pl)) ++
+           tr (th "Loc" ++ td (x.poss2 ! Loc ! Sg) ++ td (x.poss2 ! Loc ! Pl))) ;
+      s3=[]
+    } ;
+lin
+  InflectionA,InflectionA2 = \x -> {
+      t="a" ;
+      s1="" ;
+      s2=frameTable (
+           tr (th "" ++ th "Sg" ++ th "Pl") ++
+           tr (th "Nom" ++ td (x.s ! Nom ! Sg) ++ td (x.s ! Nom ! Pl)) ++
+           tr (th "Dat" ++ td (x.s ! Dat ! Sg) ++ td (x.s ! Dat ! Pl)) ++
+           tr (th "Ablat" ++ td (x.s ! Ablat ! Sg) ++ td (x.s ! Ablat ! Pl)) ++
+           tr (th "Instr" ++ td (x.s ! Instr ! Sg) ++ td (x.s ! Instr ! Pl)) ++
+           tr (th "Loc"   ++ td (x.s ! Loc ! Sg) ++ td (x.s ! Loc ! Pl)) ++
+           tr (intagAttr "th" "colspan=\"3\"" "definite forms") ++
+           tr (th "Nom" ++ td (x.def_nom ! Sg) ++ td (x.def_nom ! Pl)) ++
+           tr (th "Dat" ++ td (x.def_dat ! Sg) ++ td (x.def_dat ! Pl)) ++
+           tr (intagAttr "th" "colspan=\"3\"" "1st person possessive forms") ++
+           tr (th "Nom" ++ td (x.poss1 ! Nom ! Sg) ++ td (x.poss1 ! Nom ! Pl)) ++
+           tr (th "Dat" ++ td (x.poss1 ! Dat ! Sg) ++ td (x.poss1 ! Dat ! Pl)) ++
+           tr (th "Ablat" ++ td (x.poss1 ! Ablat ! Sg) ++ td (x.poss1 ! Ablat ! Pl)) ++
+           tr (th "Instr" ++ td (x.poss1 ! Instr ! Sg) ++ td (x.poss1 ! Instr ! Pl)) ++
+           tr (th "Loc" ++ td (x.poss1 ! Loc ! Sg) ++ td (x.poss1 ! Loc ! Pl)) ++
+           tr (intagAttr "th" "colspan=\"3\"" "2nd person possessive forms") ++
+           tr (th "Nom" ++ td (x.poss2 ! Nom ! Sg) ++ td (x.poss2 ! Nom ! Pl)) ++
+           tr (th "Dat" ++ td (x.poss2 ! Dat ! Sg) ++ td (x.poss2 ! Dat ! Pl)) ++
+           tr (th "Ablat" ++ td (x.poss2 ! Ablat ! Sg) ++ td (x.poss2 ! Ablat ! Pl)) ++
+           tr (th "Instr" ++ td (x.poss2 ! Instr ! Sg) ++ td (x.poss2 ! Instr ! Pl)) ++
+           tr (th "Loc" ++ td (x.poss2 ! Loc ! Sg) ++ td (x.poss2 ! Loc ! Pl))) ;
+      s3=[]
+    } ;
+lin
+  InflectionAdA,InflectionAdN,InflectionAdV,InflectionAdv = \x -> {t="adv"; s1=""; s2=x.s; s3=""} ;
+
+  InflectionPrep = \x -> {t="prep"; s1=""; s2=x.s; s3=""} ;
+
+lin
+  NoDefinition   t     = {s=t.s};
+  MkDefinition   t d   = {s="<p><b>Definition:</b>"++t.s++d.s++"</p>"};
+  MkDefinitionEx t d e = {s="<p><b>Definition:</b>"++t.s++d.s++"</p><p><b>Example:</b>"++e.s++"</p>"};
+
+lin
+  MkDocument d i e = {s = i.s1 ++ d.s ++ i.s2 ++ i.s3 ++ e.s} ;
+  MkTag i = {s = i.t} ;
+}

src/armenian/GrammarHye.gf

@@ -0,0 +1,2 @@
+concrete GrammarHye of Grammar = TenseX ** {
+}

src/armenian/LangHye.gf

@@ -0,0 +1,10 @@
+--# -path=.:../abstract
+concrete LangHye of Lang =
+  GrammarHye,
+  LexiconHye
+  ,DocumentationHye --# notpresent
+  ** {
+
+flags startcat = Phr ;
+
+}

src/armenian/LexiconHye.gf

@@ -0,0 +1,2 @@
+concrete LexiconHye of Lexicon = CatHye ** open ParadigmsHye in {
+}

src/armenian/NounHye.gf

@@ -0,0 +1,4 @@
+concrete NounHye of Noun = CatHye ** {
+lin
+  UseN n = n ;
+}

src/armenian/ParadigmsHye.gf

@@ -0,0 +1,491 @@
+resource ParadigmsHye = MorphoHye  ** open Predef, Prelude, CatHye, ResHye in {
+oper
+  regV : Str -> V   -- s
+    = \form -> case form of {
+		_ + "ղալ" => mkV002 form;
+		_ + "ձալ" => mkV002 form;
+		_ + "զալ" => mkV002 form;
+		_ + "լալ" => mkV002 form;
+		_ + "թալ" => mkV002 form;
+		_ + "ռալ" => mkV002 form;
+		_ + "րալ" => mkV002 form;
+		_ + "ւալ" => mkV002 form;
+		_ + "ջալ" => mkV002 form;
+		_ + "գալ" => mkV002 form;
+		_ + "տալ" => mkV002 form;
+		_ + "ճալ" => mkV002 form;
+		_ + "սալ" => mkV002 form;
+		_ + "փալ" => mkV002 form;
+		_ + "կալ" => mkV002 form;
+		_ + "վալ" => mkV002 form;
+		_ + "բալ" => mkV002 form;
+		_ + "ծալ" => mkV002 form;
+		_ + "չալ" => mkV002 form;
+		_ + "նալ" => mkV004 form;
+		_ + "ել" => mkV001 form;
+		_ => error "Cannot find an inflection rule"
+  } ;
+
+  reg2V : Str -> Str -> V   -- s  Imperative_Jussive;Pl
+    = \form1, form2 -> case <form1, form2> of {
+		<_ + "լ", _ + "է՛ք"> => mkV012 form1;
+		_ => regV form1
+  } ;
+
+  regN : Str -> N   -- s;Nom;Sg
+    = \form -> case form of {
+		_ + "իւն" => mkN008 form;
+		_ + "ժամ" => mkN007 form;
+		_ + "մոմ" => mkN007 form;
+		_ + "ւնտ" => mkN007 form;
+		_ + "րստ" => mkN007 form;
+		_ + "խոտ" => mkN007 form;
+		_ + "ելտ" => mkN007 form;
+		_ + "տառ" => mkN007 form;
+		_ + "երդ" => mkN007 form;
+		_ + "ձող" => mkN007 form;
+		_ + "փող" => mkN007 form;
+		_ + "հող" => mkN007 form;
+		_ + "խաղ" => mkN007 form;
+		_ + "իկղ" => mkN007 form;
+		_ + "շոր" => mkN007 form;
+		_ + "զոր" => mkN007 form;
+		_ + "շեր" => mkN016 form;
+		_ + "եգր" => mkN007 form;
+		_ + "թել" => mkN007 form;
+		_ + "խել" => mkN007 form;
+		_ + "ճոճ" => mkN007 form;
+		_ + "իցք" => mkN007 form;
+		_ + "ենք" => mkN007 form;
+		_ + "ուրծք" => mkN005 form;
+		_ + "յծք" => mkN007 form;
+		_ + "նչք" => mkN007 form;
+		_ + "ծոց" => mkN007 form;
+		_ + "այց" => mkN007 form;
+		_ + "կաց" => mkN007 form;
+		_ + "ջիջ" => mkN013 form;
+		_ + "եղջ" => mkN007 form;
+		_ + "ւրթ" => mkN007 form;
+		_ + "յոթ" => mkN007 form;
+		_ + "ճապ" => mkN001 form;
+		_ + "րապ" => mkN001 form;
+		_ + "լեպ" => mkN001 form;
+		_ + "ծագ" => mkN007 form;
+		_ + "ենգ" => mkN007 form;
+		_ + "գիչ" => mkN013 form;
+		_ + "միչ" => mkN013 form;
+		_ + "տիչ" => mkN013 form;
+		_ + "նիչ" => mkN013 form;
+		_ + "ւրծ" => mkN007 form;
+		_ + "թու" => mkN012 form;
+		_ + "զու" => mkN012 form;
+		_ + "ռու" => mkN012 form;
+		_ + "ճու" => mkN012 form;
+		_ + "ղու" => mkN012 form;
+		_ + "ճաշ" => mkN007 form;
+		_ + "վիշ" => mkN013 form;
+		_ + "ուրձ" => mkN005 form;
+		_ + "դհի" => mkN006 form;
+		_ + "ւդի" => mkN006 form;
+		_ + "ուն" => mkN010 form;
+		_ + "սն" => mkN007 form;
+		_ + "կն" => mkN007 form;
+		_ + "շն" => mkN007 form;
+		_ + "մն" => mkN007 form;
+		_ + "ռն" => mkN007 form;
+		_ + "ձն" => mkN007 form;
+		_ + "նն" => mkN007 form;
+		_ + "ւմ" => mkN004 form;
+		_ + "րմ" => mkN007 form;
+		_ + "ղմ" => mkN007 form;
+		_ + "յմ" => mkN007 form;
+		_ + "հմ" => mkN007 form;
+		_ + "լմ" => mkN007 form;
+		_ + "յտ" => mkN007 form;
+		_ + "յռ" => mkN007 form;
+		_ + "ղդ" => mkN007 form;
+		_ + "տղ" => mkN007 form;
+		_ + "ղխ" => mkN007 form;
+		_ + "լխ" => mkN007 form;
+		_ + "ճխ" => mkN007 form;
+		_ + "չխ" => mkN007 form;
+		_ + "ղկ" => mkN007 form;
+		_ + "սկ" => mkN007 form;
+		_ + "տր" => mkN007 form;
+		_ + "կր" => mkN007 form;
+		_ + "նր" => mkN007 form;
+		_ + "ղր" => mkN007 form;
+		_ + "խր" => mkN007 form;
+		_ + "բր" => mkN007 form;
+		_ + "օր" => mkN016 form;
+		_ + "յլ" => mkN007 form;
+		_ + "րս" => mkN007 form;
+		_ + "մս" => mkN007 form;
+		_ + "փս" => mkN007 form;
+		_ + "լս" => mkN007 form;
+		_ + "րճ" => mkN007 form;
+		_ + "եճ" => mkN007 form;
+		_ + "աճ" => mkN007 form;
+		_ + "նճ" => mkN007 form;
+		_ + "ջք" => mkN007 form;
+		_ + "մք" => mkN007 form;
+		_ + "վք" => mkN007 form;
+		_ + "թք" => mkN007 form;
+		_ + "բք" => mkN007 form;
+		_ + "խց" => mkN007 form;
+		_ + "ղց" => mkN007 form;
+		_ + "վթ" => mkN007 form;
+		_ + "ղբ" => mkN007 form;
+		_ + "րբ" => mkN007 form;
+		_ + "ուբ" => mkN005 form;        
+		_ + "զբ" => mkN007 form;
+		_ + "եբ" => mkN007 form;
+		_ + "ոպ" => mkN001 form;
+		_ + "ւպ" => mkN001 form;
+		_ + "իպ" => mkN001 form;
+		_ + "եգ" => mkN007 form;
+		_ + "իգ" => mkN007 form;
+		_ + "ոգ" => mkN007 form;
+		_ + "յգ" => mkN007 form;
+		_ + "ուրչ" => mkN005 form;
+		_ + "շչ" => mkN007 form;
+		_ + "նծ" => mkN007 form;
+		_ + "եծ" => mkN007 form;
+		_ + "յծ" => mkN007 form;
+		_ + "եւ" => mkN001 form;
+		_ + "աւ" => mkN001 form;
+		_ + "ւժ" => mkN007 form;
+		_ + "իժ" => mkN013 form;
+		_ + "քշ" => mkN007 form;
+		_ + "րշ" => mkN007 form;
+		_ + "ուզ" => mkN005 form;
+		_ + "րզ" => mkN007 form;
+		_ + "ավ" => mkN007 form;
+		_ + "յվ" => mkN007 form;
+		_ + "աֆ" => mkN001 form;
+		_ + "լֆ" => mkN001 form;
+		_ + "իփ" => mkN001 form;
+		_ + "ափ" => mkN001 form;
+		_ + "ոյ" => mkN007 form;
+		_ + "լի" => mkN006 form;
+		_ + "բի" => mkN006 form;
+		_ + "խի" => mkN006 form;
+		_ + "թի" => mkN006 form;
+		_ + "պի" => mkN006 form;
+		_ + "վի" => mkN006 form;
+		_ + "փի" => mkN006 form;
+		_ + "աի" => mkN006 form;
+		_ + "ջի" => mkN006 form;
+		_ + "ն" => mkN001 form;
+		_ + "մ" => mkN001 form;
+		_ + "տ" => mkN001 form;
+		_ + "ռ" => mkN001 form;
+		_ + "դ" => mkN001 form;
+		_ + "ղ" => mkN001 form;
+		_ + "խ" => mkN001 form;
+		_ + "կ" => mkN001 form;
+		_ + "ր" => mkN001 form;
+		_ + "լ" => mkN001 form;
+		_ + "ս" => mkN001 form;
+		_ + "ճ" => mkN001 form;
+		_ + "ք" => mkN001 form;
+		_ + "ց" => mkN001 form;
+		_ + "ջ" => mkN001 form;
+		_ + "թ" => mkN001 form;
+		_ + "բ" => mkN001 form;
+		_ + "պ" => mkN007 form;
+		_ + "գ" => mkN001 form;
+		_ + "չ" => mkN001 form;
+		_ + "ծ" => mkN001 form;
+		_ + "ւ" => mkN006 form;
+		_ + "ժ" => mkN001 form;
+		_ + "շ" => mkN001 form;
+		_ + "զ" => mkN001 form;
+		_ + "ձ" => mkN007 form;
+		_ + "վ" => mkN001 form;
+		_ + "ֆ" => mkN007 form;
+		_ + "հ" => mkN001 form;
+		_ + "փ" => mkN007 form;
+		_ + "յ" => mkN001 form;
+		_ + "ա" => mkN002 form;
+		_ + "ո" => mkN002 form;
+		_ + "ի" => mkN003 form;
+		_ + "ե" => mkN006 form;
+		_ + "է" => mkN006 form;
+		_ => error "Cannot find an inflection rule"
+  } ;
+
+  reg2N : Str -> Str -> N   -- s;Nom;Sg  s;Dat;Sg
+    = \form1, form2 -> case <form1, form2> of {
+		<_ + "թու", _ + "ւի"> => mkN006 form1;
+		<_ + "շեր", _ + "ի"> => mkN001 form1;
+		<_ + "ժամ", _ + "ա"> => mkN016 form1;
+		<_ + "ուն", _ + "բնի"> => mkN005 form1;
+		<_ + "ւն", _ + "վան"> => mkN009 form1;
+		<_ + "ւն", _ + "տան"> => mkN028 form1;
+		<_ + "ւն", _ + "շան"> => mkN028 form1;
+		<_ + "ւզ", _ + "ւզի"> => mkN001 form1;
+		<_ + "ւն", _ + "ի"> => mkN001 form1;
+		<_ + "ւն", _ + "ա"> => mkN032 form1;
+		<_ + "ւմ", _ + "ի"> => mkN001 form1;
+		<_ + "լի", _ + "ւ"> => mkN003 form1;
+		<_ + "բի", _ + "ւ"> => mkN003 form1;
+		<_ + "խի", _ + "ւ"> => mkN003 form1;
+		<_ + "թի", _ + "ւ"> => mkN003 form1;
+		<_ + "տ", _ + "մտի"> => mkN005 form1;
+		<_ + "տ", _ + "գտի"> => mkN005 form1;
+		<_ + "տ", _ + "վտի"> => mkN013 form1;
+		<_ + "ռ", _ + "ճռի"> => mkN013 form1;
+		<_ + "ն", _ + "ծնի"> => mkN013 form1;
+		<_ + "ն", _ + "տնի"> => mkN013 form1;
+		<_ + "ն", _ + "ցնի"> => mkN013 form1;
+		<_ + "ն", _ + "ձնի"> => mkN013 form1;
+		<_ + "ն", _ + "բնի"> => mkN013 form1;
+		<_ + "ն", _ + "խնի"> => mkN013 form1;
+		<_ + "ղ", _ + "ւղի"> => mkN007 form1;
+		<_ + "ղ", _ + "վղի"> => mkN013 form1;
+		<_ + "ղ", _ + "փղի"> => mkN015 form1;
+		<_ + "ղ", _ + "տղի"> => mkN031 form1;
+		<_ + "խ", _ + "ծխի"> => mkN005 form1;
+		<_ + "խ", _ + "բխի"> => mkN031 form1;
+		<_ + "կ", _ + "ղկի"> => mkN013 form1;
+		<_ + "կ", _ + "տկի"> => mkN013 form1;
+		<_ + "կ", _ + "պկի"> => mkN013 form1;
+		<_ + "կ", _ + "զկի"> => mkN031 form1;
+		<_ + "ս", _ + "մսի"> => mkN013 form1;
+		<_ + "ճ", _ + "վճի"> => mkN013 form1;
+		<_ + "ճ", _ + "հճի"> => mkN013 form1;
+		<_ + "ց", _ + "տցի"> => mkN005 form1;
+		<_ + "ց", _ + "կցի"> => mkN013 form1;
+		<_ + "ր", _ + "դրի"> => mkN013 form1;
+		<_ + "ր", _ + "գրի"> => mkN015 form1;
+		<_ + "ր", _ + "տրի"> => mkN005 form1;
+		<_ + "ր", _ + "ջրի"> => mkN005 form1;
+		<_ + "ր", _ + "լրի"> => mkN005 form1;
+		<_ + "ր", _ + "նրի"> => mkN013 form1;
+		<_ + "ր", _ + "խրի"> => mkN013 form1;
+		<_ + "ր", _ + "կրի"> => mkN013 form1;
+		<_ + "ր", _ + "ցրի"> => mkN013 form1;
+		<_ + "չ", _ + "պչի"> => mkN013 form1;
+		<_ + "չ", _ + "կչի"> => mkN013 form1;
+		<_ + "չ", _ + "րչի"> => mkN013 form1;
+		<_ + "չ", _ + "ցչի"> => mkN013 form1;
+		<_ + "չ", _ + "վչի"> => mkN013 form1;
+		<_ + "ծ", _ + "գծի"> => mkN015 form1;
+		<_ + "շ", _ + "փշի"> => mkN005 form1;
+		<_ + "ի", _ + "իու"> => mkN027 form1;
+		<_ + "ի", _ + "ձիի"> => mkN017 form1;
+		<_ + "ւ", _ + "վի"> => mkN012 form1;
+		<_ + "տ", _ + "ա"> => mkN016 form1;
+		<_ + "ռ", _ + "ն"> => mkN026 form1;
+		<_ + "ն", _ + "ջ"> => mkN034 form1;
+		<_ + "կ", _ + "ա"> => mkN016 form1;
+		<_ + "կ", _ + "ն"> => mkN023 form1;
+		<_ + "ր", _ + "ջ"> => mkN043 form1;
+		<_ + "ի", _ + "ի"> => mkN006 form1;
+		_ => regN form1
+  } ;
+
+  regA : Str -> A   -- s;Nom;Sg
+    = \form -> case form of {
+		_ + "կիչ" => mkA006 form;
+		_ + "ենգ" => mkA005 form;
+		_ + "աղջ" => mkA005 form;
+		_ + "սկի" => mkA003 form;
+		_ + "աղի" => mkA003 form;
+		_ + "ղց" => mkA005 form;
+		_ + "ջն" => mkA005 form;
+		_ + "եպ" => mkA005 form;
+		_ + "նտ" => mkA005 form;
+		_ + "ոդ" => mkA005 form;
+		_ + "ղծ" => mkA005 form;
+		_ + "յծ" => mkA005 form;
+		_ + "եծ" => mkA005 form;
+		_ + "ձր" => mkA005 form;
+		_ + "նր" => mkA005 form;
+		_ + "ծր" => mkA005 form;
+		_ + "մր" => mkA005 form;
+		_ + "սր" => mkA005 form;
+		_ + "քր" => mkA005 form;
+		_ + "ցր" => mkA005 form;
+		_ + "եւ" => mkA001 form;
+		_ + "ոկ" => mkA005 form;
+		_ + "ղմ" => mkA005 form;
+		_ + "տք" => mkA005 form;
+		_ + "իղ" => mkA006 form;
+		_ + "նչ" => mkA008 form;
+		_ + "ոխ" => mkA005 form;
+		_ + "ղխ" => mkA005 form;
+		_ + "ղթ" => mkA005 form;
+		_ + "ւթ" => mkA011 form;
+		_ + "րշ" => mkA005 form;
+		_ + "եշ" => mkA005 form;
+		_ + "քշ" => mkA005 form;
+		_ + "ոռ" => mkA005 form;
+		_ + "ւգ" => mkA005 form;
+		_ + "եգ" => mkA005 form;
+		_ + "րճ" => mkA005 form;
+		_ + "րզ" => mkA005 form;
+		_ + "եզ" => mkA005 form;
+		_ + "ւփ" => mkA005 form;
+		_ + "նջ" => mkA005 form;
+		_ + "աջ" => mkA005 form;
+		_ + "մբ" => mkA001 form;
+		_ + "ոյ" => mkA001 form;
+		_ + "բի" => mkA003 form;
+		_ + "սի" => mkA003 form;
+		_ + "ց" => mkA001 form;
+		_ + "ն" => mkA001 form;
+		_ + "պ" => mkA001 form;
+		_ + "տ" => mkA001 form;
+		_ + "դ" => mkA001 form;
+		_ + "վ" => mkA001 form;
+		_ + "ծ" => mkA001 form;
+		_ + "ձ" => mkA001 form;
+		_ + "ր" => mkA001 form;
+		_ + "լ" => mkA001 form;
+		_ + "ւ" => mkA002 form;
+		_ + "կ" => mkA001 form;
+		_ + "մ" => mkA001 form;
+		_ + "ք" => mkA001 form;
+		_ + "ղ" => mkA001 form;
+		_ + "չ" => mkA001 form;
+		_ + "ժ" => mkA001 form;
+		_ + "խ" => mkA001 form;
+		_ + "թ" => mkA001 form;
+		_ + "ս" => mkA001 form;
+		_ + "շ" => mkA001 form;
+		_ + "հ" => mkA001 form;
+		_ + "ռ" => mkA001 form;
+		_ + "գ" => mkA001 form;
+		_ + "ճ" => mkA001 form;
+		_ + "զ" => mkA001 form;
+		_ + "փ" => mkA001 form;
+		_ + "ջ" => mkA001 form;
+		_ + "բ" => mkA005 form;
+		_ + "յ" => mkA005 form;
+		_ + "ե" => mkA002 form;
+		_ + "ի" => mkA002 form;
+		_ + "ա" => mkA004 form;
+		_ + "ո" => mkA004 form;
+		_ => error "Cannot find an inflection rule"
+  } ;
+
+  reg2A : Str -> Str -> A   -- s;Nom;Sg  s;Nom;Pl
+    = \form1, form2 -> case <form1, form2> of {
+		<_ + "ոռ", _ + "ներ"> => mkA001 form1;
+		<_ + "տ", _ + "տեր"> => mkA005 form1;
+		<_ + "վ", _ + "վեր"> => mkA005 form1;
+		<_ + "ծ", _ + "ծեր"> => mkA005 form1;
+		<_ + "ձ", _ + "ձեր"> => mkA005 form1;
+		<_ + "լ", _ + "լեր"> => mkA005 form1;
+		<_ + "կ", _ + "կեր"> => mkA005 form1;
+		<_ + "մ", _ + "մեր"> => mkA005 form1;
+		<_ + "ք", _ + "քեր"> => mkA005 form1;
+		<_ + "ղ", _ + "ղեր"> => mkA005 form1;
+		<_ + "խ", _ + "խեր"> => mkA005 form1;
+		<_ + "թ", _ + "թեր"> => mkA005 form1;
+		<_ + "շ", _ + "շեր"> => mkA005 form1;
+		<_ + "հ", _ + "հեր"> => mkA005 form1;
+		<_ + "ռ", _ + "ռեր"> => mkA005 form1;
+		<_ + "գ", _ + "գեր"> => mkA005 form1;
+		<_ + "ճ", _ + "ճեր"> => mkA005 form1;
+		<_ + "զ", _ + "զեր"> => mkA005 form1;
+		<_ + "ջ", _ + "ջեր"> => mkA005 form1;
+		_ => regA form1
+  } ;
+
+  mkV = overload {
+    mkV : Str -> V = regV;   -- s
+    mkV : Str -> Str -> V = reg2V   -- s  Imperative_Jussive;Pl
+  } ;
+
+  mkVV : V -> VV = \v -> lin VV v ;
+  mkVS : V -> VS = \v -> lin VS v ;
+  mkVQ : V -> VQ = \v -> lin VQ v ;
+  mkVA : V -> VA = \v -> lin VA v ;
+
+  mkV2 = overload {
+     mkV2 : V -> V2 = \v -> lin V2 (v ** {c2 = noPrep}) ;
+     mkV2 : V -> Prep -> V2 = \v,p -> lin V2 (v ** {c2 = p}) ;
+  } ;
+
+  mkV3 = overload {
+     mkV3 : V -> V3 = \v -> lin V3 (v ** {c2 = noPrep; c3 = noPrep}) ;
+     mkV3 : V -> Prep -> Prep -> V3 = \v,p1,p2 -> lin V3 (v ** {c2 = p1; c3 = p2}) ;
+  } ;
+
+  mkV2A = overload {
+     mkV2A : V -> V2A = \v -> lin V2A (v ** {c2 = noPrep; c3 = noPrep}) ;
+     mkV2A : V -> Prep -> Prep -> V2A = \v,p1,p2 -> lin V2A (v ** {c2 = p1; c3 = p2}) ;
+  } ;
+
+  mkV2S = overload {
+     mkV2S : V -> V2S = \v -> lin V2S (v ** {c2 = noPrep; c3 = noPrep}) ;
+     mkV2S : V -> Prep -> Prep -> V2S = \v,p1,p2 -> lin V2S (v ** {c2 = p1; c3 = p2}) ;
+  } ;
+
+  mkV2Q = overload {
+     mkV2Q : V -> V2Q = \v -> lin V2Q (v ** {c2 = noPrep; c3 = noPrep}) ;
+     mkV2Q : V -> Prep -> Prep -> V2Q = \v,p1,p2 -> lin V2Q (v ** {c2 = p1; c3 = p2}) ;
+  } ;
+
+  mkV2V = overload {
+     mkV2V : V -> V2V = \v -> lin V2V (v ** {c2 = noPrep; c3 = noPrep}) ;
+     mkV2V : V -> Prep -> Prep -> V2V = \v,p1,p2 -> lin V2V (v ** {c2 = p1; c3 = p2}) ;
+  } ;
+
+  mkN = overload {
+    mkN : Str -> N = regN;   -- s;Nom;Sg
+    mkN : Str -> Str -> N = reg2N   -- s;Nom;Sg  s;Dat;Sg
+  } ;
+
+  mkN2 = overload {
+     mkN2 : N -> N2 = \n -> lin N2 (n ** {c2 = noPrep}) ;
+     mkN2 : N -> Prep -> N2 = \n,p -> lin N2 (n ** {c2 = p}) ;
+  } ;
+
+  mkN3 = overload {
+     mkN3 : N -> N3 = \n -> lin N3 (n ** {c2 = noPrep; c3 = noPrep}) ;
+     mkN3 : N -> Prep -> Prep -> N3 = \n,p1,p2 -> lin N3 (n ** {c2 = p1; c3 = p2}) ;
+  } ;
+
+  mkA = overload {
+    mkA : Str -> A = regA;   -- s;Nom;Sg
+    mkA : Str -> Str -> A = reg2A   -- s;Nom;Sg  s;Nom;Pl
+  } ;
+
+  mkA2 = overload {
+     mkA2 : A -> A2 = \a -> lin A2 (a ** {c2 = noPrep}) ;
+     mkA2 : A -> Prep -> A2 = \a,p -> lin A2 (a ** {c2 = p}) ;
+  } ;
+
+  mkAdv : Str -> Adv = \s -> lin Adv {s=s} ;
+  mkAdV : Str -> AdV = \s -> lin AdV {s=s} ;
+  mkAdA : Str -> AdA = \s -> lin AdA {s=s} ;
+  mkAdN : Str -> AdN = \s -> lin AdN {s=s} ;
+  mkCAdv : Str -> CAdv = \s -> lin CAdv {s=s; p=""} ;
+  mkInterj : Str -> Interj = \s -> lin Interj {s=s} ;
+  mkMU : Str -> MU = \s -> lin MU {s=s; isPre=False} ;
+
+  mkPrep : Str -> Prep = \s -> lin Prep {s=s; c=Dat} ;
+
+  mkIAdv : Str -> IAdv = \s -> lin IAdv {s=s} ;
+  mkIP : Str -> IP = \s -> lin IP {s=s} ;
+  mkIQuant : Str -> IQuant = \s -> lin IQuant {s=s} ;
+  mkIDet : Str -> IDet = \s -> lin IDet {s=s} ;
+  mkSubj : Str -> Subj = \s -> lin Subj {s=s} ;
+  mkQuant : Str -> Quant = \s -> lin Quant {s=s} ;
+  mkPredet : Str -> Predet = \s -> lin Predet {s=s} ;
+  mkDet : Str -> Det = \s -> lin Det {s=s} ;
+  mkCard : Str -> Card = \s -> lin Card {s=s} ;
+  mkConj : Str -> Conj = \s -> lin Conj {s=s} ;
+  mkPConj : Str -> PConj = \s -> lin PConj {s=s} ;
+  mkVoc : Str -> Voc = \s -> lin Voc {s=s} ;
+
+  mkLN : Str -> LN = \s -> lin LN {s=s} ;
+  mkGN : Str -> GN = \s -> lin GN {s=s} ;
+  mkSN : Str -> SN = \s -> lin SN {s=s} ;
+  mkPN : Str -> PN = \s -> lin PN {s=s} ;
+
+}

src/armenian/PhraseHye.gf

@@ -0,0 +1,11 @@
+concrete PhraseHye of Phrase = CatHye ** {
+lin
+  PhrUtt pconj utt voc = {s = pconj.s ++ utt.s ++ voc.s} ;
+
+  UttS s = s ;
+  UttInterj i = i ;
+
+  NoPConj = {s = []} ;
+
+  NoVoc = {s = []} ;
+}

src/armenian/ResHye.gf

@@ -0,0 +1,269 @@
+resource ResHye = {
+
+param Aspect = Non_Past | Perfect ;
+param Person = P1 | P3 | P2 ;
+param Number = Sg | Pl ;
+param Case = Nom | Dat | Ablat | Instr | Loc ;
+param PartType = Resultative | Subject ;
+oper Verb = {s: Str; Causative: Str; Conditional: Aspect => Person => Number => Str; Converb: {Imperfective: Str; FutCon1: Str; FutCon2: Str; Negative: Str; Perfective: Str; Simultaneous: Str}; Imperative_Jussive: Number => Str; Passive: Str; Past: Person => Number => Str; Participle: PartType => Str; Subjunctive: Aspect => Person => Number => Str} ; -- 898
+oper mkVerb : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ : Str) -> Verb =
+       \f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13,f14,f15,f16,f17,f18,f19,f20,f21,f22,f23,f24,f25,f26,f27,f28,f29,f30,f31,f32,f33,f34,f35,f36,f37,f38,f39,f40,f41,f42,f43 ->
+          { s = f1 ;
+            Causative = f2 ;
+            Conditional = table {
+                            Perfect => table {
+                                         P1 => table {
+                                                 Sg => f3 ;
+                                                 Pl => f4
+                                               } ;
+                                         P2 => table {
+                                                 Sg => f5 ;
+                                                 Pl => f6
+                                               } ;
+                                         P3 => table {
+                                                 Sg => f7 ;
+                                                 Pl => f8
+                                               }
+                                       } ;
+                            Non_Past => table {
+                                          P1 => table {
+                                                  Sg => f9 ;
+                                                  Pl => f10
+                                                } ;
+                                          P2 => table {
+                                                  Sg => f11 ;
+                                                  Pl => f12
+                                                } ;
+                                          P3 => table {
+                                                  Sg => f13 ;
+                                                  Pl => f14
+                                                }
+                                        }
+                          } ;
+            Converb = { Imperfective = f15 ;
+                        FutCon1 = f16 ;
+                        FutCon2 = f17 ;
+                        Negative = f18 ;
+                        Perfective = f19 ;
+                        Simultaneous = f20
+                      } ;
+            Imperative_Jussive = table {
+                                   Sg => f21 ;
+                                   Pl => f22
+                                 } ;
+            Passive = f23 ;
+            Past = table {
+                     P1 => table {
+                             Sg => f24 ;
+                             Pl => f25
+                           } ;
+                     P2 => table {
+                             Sg => f26 ;
+                             Pl => f27
+                           } ;
+                     P3 => table {
+                             Sg => f28 ;
+                             Pl => f29
+                           }
+                   } ;
+            Participle = table {
+                           Resultative => f30 ;
+                           Subject => f31
+                         } ;
+            Subjunctive = table {
+                            Perfect => table {
+                                         P1 => table {
+                                                 Sg => f32 ;
+                                                 Pl => f33
+                                               } ;
+                                         P2 => table {
+                                                 Sg => f34 ;
+                                                 Pl => f35
+                                               } ;
+                                         P3 => table {
+                                                 Sg => f36 ;
+                                                 Pl => f37
+                                               }
+                                       } ;
+                            Non_Past => table {
+                                          P1 => table {
+                                                  Sg => f38 ;
+                                                  Pl => f39
+                                                } ;
+                                          P2 => table {
+                                                  Sg => f40 ;
+                                                  Pl => f41
+                                                } ;
+                                          P3 => table {
+                                                  Sg => f42 ;
+                                                  Pl => f43
+                                                }
+                                        }
+                          }
+          } ;
+
+
+oper Noun = {s: Case => Number => Str; def_dat: Number => Str; def_nom: Number => Str; poss1: Case => Number => Str; poss2: Case => Number => Str} ; -- 4880
+oper mkNoun : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ : Str) -> Noun =
+       \f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13,f14,f15,f16,f17,f18,f19,f20,f21,f22,f23,f24,f25,f26,f27,f28,f29,f30,f31,f32,f33,f34 ->
+          { s = table {
+                  Nom => table {
+                           Sg => f1 ;
+                           Pl => f2
+                         } ;
+                  Dat => table {
+                           Sg => f3 ;
+                           Pl => f4
+                         } ;
+                  Ablat => table {
+                             Sg => f5 ;
+                             Pl => f6
+                           } ;
+                  Instr => table {
+                             Sg => f7 ;
+                             Pl => f8
+                           } ;
+                  Loc => table {
+                           Sg => f9 ;
+                           Pl => f10
+                         }
+                } ;
+            def_dat = table {
+                        Sg => f11 ;
+                        Pl => f12
+                      } ;
+            def_nom = table {
+                        Sg => f13 ;
+                        Pl => f14
+                      } ;
+            poss1 = table {
+                      Nom => table {
+                               Sg => f15 ;
+                               Pl => f16
+                             } ;
+                      Dat => table {
+                               Sg => f17 ;
+                               Pl => f18
+                             } ;
+                      Ablat => table {
+                                 Sg => f19 ;
+                                 Pl => f20
+                               } ;
+                      Instr => table {
+                                 Sg => f21 ;
+                                 Pl => f22
+                               } ;
+                      Loc => table {
+                               Sg => f23 ;
+                               Pl => f24
+                             }
+                    } ;
+            poss2 = table {
+                      Nom => table {
+                               Sg => f25 ;
+                               Pl => f26
+                             } ;
+                      Dat => table {
+                               Sg => f27 ;
+                               Pl => f28
+                             } ;
+                      Ablat => table {
+                                 Sg => f29 ;
+                                 Pl => f30
+                               } ;
+                      Instr => table {
+                                 Sg => f31 ;
+                                 Pl => f32
+                               } ;
+                      Loc => table {
+                               Sg => f33 ;
+                               Pl => f34
+                             }
+                    }
+          } ;
+
+
+oper Adj = {s: Case => Number => Str; def_dat: Number => Str; def_nom: Number => Str; poss1: Case => Number => Str; poss2: Case => Number => Str} ; -- 1608
+oper mkAdj : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ : Str) -> Adj =
+       \f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13,f14,f15,f16,f17,f18,f19,f20,f21,f22,f23,f24,f25,f26,f27,f28,f29,f30,f31,f32,f33,f34 ->
+          { s = table {
+                  Nom => table {
+                           Sg => f1 ;
+                           Pl => f2
+                         } ;
+                  Dat => table {
+                           Sg => f3 ;
+                           Pl => f4
+                         } ;
+                  Ablat => table {
+                             Sg => f5 ;
+                             Pl => f6
+                           } ;
+                  Instr => table {
+                             Sg => f7 ;
+                             Pl => f8
+                           } ;
+                  Loc => table {
+                           Sg => f9 ;
+                           Pl => f10
+                         }
+                } ;
+            def_dat = table {
+                        Sg => f11 ;
+                        Pl => f12
+                      } ;
+            def_nom = table {
+                        Sg => f13 ;
+                        Pl => f14
+                      } ;
+            poss1 = table {
+                      Nom => table {
+                               Sg => f15 ;
+                               Pl => f16
+                             } ;
+                      Dat => table {
+                               Sg => f17 ;
+                               Pl => f18
+                             } ;
+                      Ablat => table {
+                                 Sg => f19 ;
+                                 Pl => f20
+                               } ;
+                      Instr => table {
+                                 Sg => f21 ;
+                                 Pl => f22
+                               } ;
+                      Loc => table {
+                               Sg => f23 ;
+                               Pl => f24
+                             }
+                    } ;
+            poss2 = table {
+                      Nom => table {
+                               Sg => f25 ;
+                               Pl => f26
+                             } ;
+                      Dat => table {
+                               Sg => f27 ;
+                               Pl => f28
+                             } ;
+                      Ablat => table {
+                                 Sg => f29 ;
+                                 Pl => f30
+                               } ;
+                      Instr => table {
+                                 Sg => f31 ;
+                                 Pl => f32
+                               } ;
+                      Loc => table {
+                               Sg => f33 ;
+                               Pl => f34
+                             }
+                    }
+          } ;
+
+
+oper Compl = {s : Str; c : Case} ;
+oper noPrep : Compl = {s=""; c=Dat} ;
+
+}

src/bantu/DiffBantu.gf

@@ -19,7 +19,7 @@ param
 
 oper
 --  AGRE = {g : Gender ; n : Number  ; p : Person} ;
-  Agre : Type = {g : Gender ; n : Number ;  p : Person} ;
+  Agre : PType = {g : Gender ; n : Number ;  p : Person} ;
   agre : Gender -> Number -> Person -> Agre = \g,n,p -> {g = g ; n = n ; p = p} ;
 
   agrFeatures : Agr -> Agre = \a -> case a of {Ag g n p => {g = g ; n = n ; p = p}} ;

src/basque/CatEus.gf

@@ -121,7 +121,7 @@ concrete CatEus of Cat = CommonX ** open ResEus, Prelude in {
     N = ResEus.Noun ;
     N2 = ResEus.Noun2 ;
     N3 = ResEus.Noun3 ;
-    PN = ResEus.PNoun ; 
+    PN,LN,GN,SN = ResEus.PNoun ;
 
 
 linref

src/basque/ConjunctionEus.gf

@@ -91,7 +91,7 @@ oper
 
   -- Use linCNIndef so that words with FinalA get the -a at the end
   baseCN : CN -> CN -> [CN] = \x,y ->  
-    y ** --choose all the other fields from second argument
+    lin ListCN y ** --choose all the other fields from second argument
     { s1 = \\agr => linCNIndef x ;
       s2 = y.s } ;
 

src/basque/DocumentationEus.gf

@@ -0,0 +1,65 @@
+--# -path=.:../abstract:../common
+concrete DocumentationEus of Documentation = CatEus ** open
+  ResEus,
+  Prelude,
+  HTML in {
+
+lincat
+  Inflection = {t : Str; s1,s2 : Str} ;
+  Definition = {s : Str} ;
+  Document = {s : Str} ;
+  Tag      = {s : Str} ;
+
+lin
+  InflectionN, InflectionN2, InflectionN3 = \n -> {
+    t  = "n" ;
+    s1 = heading1 "Noun" ;
+    s2 = frameTable (
+          tr (th ""            ++ th "Sg"                            ++ th "Pl") ++
+          tr (th "absolutive"  ++ td (n.s++artDef ! Sg ! Abs ! n.ph) ++ td (n.s++artDef ! Pl ! Abs ! n.ph)) ++
+          tr (th "ergative"    ++ td (n.s++artDef ! Sg ! Erg ! n.ph) ++ td (n.s++artDef ! Pl ! Erg ! n.ph)) ++
+          tr (th "dative"      ++ td (n.s++artDef ! Sg ! Dat ! n.ph) ++ td (n.s++artDef ! Pl ! Dat ! n.ph)) ++
+          tr (th "genitive"    ++ td (n.s++artDef ! Sg ! Gen ! n.ph) ++ td (n.s++artDef ! Pl ! Gen ! n.ph)) ++
+          tr (th "commitative" ++ td (n.s++artDef ! Sg ! Soc ! n.ph) ++ td (n.s++artDef ! Pl ! Soc ! n.ph)) ++
+          tr (th "instrumental"++ td (n.s++artDef ! Sg ! Ins ! n.ph) ++ td (n.s++artDef ! Pl ! Ins ! n.ph)) ++
+          tr (th "inessive"    ++ td (n.s++artDef ! Sg ! Ine ! n.ph) ++ td (n.s++artDef ! Pl ! Ine ! n.ph)) ++
+          tr (th "partitive"   ++ td (n.s++artDef ! Sg ! Par ! n.ph) ++ td (n.s++artDef ! Pl ! Par ! n.ph))
+          ) ;
+    } ;
+
+  InflectionA, InflectionA2, InflectionA3 = \a -> {
+    t  = "a" ;
+    s1 = heading1 "Adjective" ;
+    s2 = frameTable (
+          tr (th ""            ++ th "Sg"                            ++ th "Pl") ++
+          tr (th "absolutive"  ++ td (a.s ! AF Posit++artDef ! Sg ! Abs ! a.ph) ++ td (a.s ! AF Posit++artDef ! Pl ! Abs ! a.ph)) ++
+          tr (th "ergative"    ++ td (a.s ! AF Posit++artDef ! Sg ! Erg ! a.ph) ++ td (a.s ! AF Posit++artDef ! Pl ! Erg ! a.ph)) ++
+          tr (th "dative"      ++ td (a.s ! AF Posit++artDef ! Sg ! Dat ! a.ph) ++ td (a.s ! AF Posit++artDef ! Pl ! Dat ! a.ph)) ++
+          tr (th "genitive"    ++ td (a.s ! AF Posit++artDef ! Sg ! Gen ! a.ph) ++ td (a.s ! AF Posit++artDef ! Pl ! Gen ! a.ph)) ++
+          tr (th "commitative" ++ td (a.s ! AF Posit++artDef ! Sg ! Soc ! a.ph) ++ td (a.s ! AF Posit++artDef ! Pl ! Soc ! a.ph)) ++
+          tr (th "instrumental"++ td (a.s ! AF Posit++artDef ! Sg ! Ins ! a.ph) ++ td (a.s ! AF Posit++artDef ! Pl ! Ins ! a.ph)) ++
+          tr (th "inessive"    ++ td (a.s ! AF Posit++artDef ! Sg ! Ine ! a.ph) ++ td (a.s ! AF Posit++artDef ! Pl ! Ine ! a.ph)) ++
+          tr (th "partitive"   ++ td (a.s ! AF Posit++artDef ! Sg ! Par ! a.ph) ++ td (a.s ! AF Posit++artDef ! Pl ! Par ! a.ph))
+          ) ;
+    } ;
+
+  InflectionV, InflectionV2, InflectionV3, InflectionVA, InflectionVS, InflectionVQ, InflectionV2A, InflectionV2S, InflectionV2Q = \v -> {
+    t  = "v" ;
+    s1 = heading1 "Verb" ;
+    s2 = frameTable (
+          tr (th "present" ++ td (v.prc ! Pres)) ++
+          tr (th "past"    ++ td (v.prc ! Past)) ++
+          tr (th "future"  ++ td (v.prc ! Fut))
+          ) ;
+    } ;
+
+lin
+  NoDefinition   t     = {s=t.s};
+  MkDefinition   t d   = {s="<p><b>Definition:</b>"++t.s++d.s++"</p>"};
+  MkDefinitionEx t d e = {s="<p><b>Definition:</b>"++t.s++d.s++"</p><p><b>Example:</b>"++e.s++"</p>"};
+
+lin
+  MkDocument d i e = {s = i.s1 ++ d.s ++ i.s2 ++ paragraph e.s} ;
+  MkTag i = {s = i.t} ;
+
+}

src/basque/LangEus.gf

@@ -2,6 +2,7 @@ concrete LangEus of Lang =
   GrammarEus,
   LexiconEus,
   ConstructionEus
+  ,DocumentationEus --# notpresent
 
   ** {
 

src/basque/LexiconEus.gf

@@ -196,7 +196,7 @@ lin jump_V = mkV "jauzi" egin_V ; --Apertium
 lin kill_V2 = mkV2 "hil" ; --Apertium
 lin king_N = mkN "errege" animate ; --Apertium
 lin knee_N = mkN "belaun" ; --Apertium
-lin know_V2 = lin V2 jakin_V2 ; -- synthetic verb
+lin know_V2 = jakin_V2 ; -- synthetic verb
 lin know_VQ = lin VQ jakin_V2 ; -- synthetic verb
 
 lin know_VS = ukanV "uste" ;
@@ -426,11 +426,11 @@ oper
   egin_V : V = mkV "egin" ;
 
   -- Some synthetic verbs
-  etorri_V : R.Verb = R.syntVerbDa "etorri" R.Etorri ;
+  etorri_V : V = lin V (R.syntVerbDa "etorri" R.Etorri) ;
 
-  ibili_V : R.Verb = R.syntVerbDa "ibili" R.Ibili ;
+  ibili_V : V = lin V (R.syntVerbDa "ibili" R.Ibili) ;
 
-  jakin_V2 : R.Verb = R.syntVerbDu "jakin" R.Jakin ;
+  jakin_V2 : V2 = lin V2 (R.syntVerbDu "jakin" R.Jakin) ;
 
-  joan_V : R.Verb = R.syntVerbDa "joan" R.Joan ;
+  joan_V : V = lin V (R.syntVerbDa "joan" R.Joan) ;
 }

src/basque/NumeralEus.gf

@@ -29,6 +29,8 @@ lincat Sub10 = LinDigit ;
 lincat Sub100 = {s : Str ; n : Number } ;
 lincat Sub1000 = {s : Str ; n : Number ; isHundred : Bool } ;
 lincat Sub1000000 = {s : Str ; n : Number } ;
+lincat Sub1000000000 = {s : Str ; n : Number } ;
+lincat Sub1000000000000 = {s : Str ; n : Number } ;
 
 
 ----------------------------------------------------------------------------

src/basque/ParadigmsEus.gf

@@ -42,6 +42,9 @@ oper
   } ;
 
   mkPN : Str -> PN = \s -> lin PN (mkPNoun s) ;
+  mkLN : Str -> LN = \s -> lin LN (mkPNoun s) ;
+  mkGN : Str -> GN = \s -> lin GN (mkPNoun s) ;
+  mkSN : Str -> SN = \s -> lin SN (mkPNoun s) ;
 
   mkN2 = overload {
     mkN2 : Str -> N2 = \s -> lin N2 (mkNoun2 s genitive) ; 
@@ -64,7 +67,7 @@ oper
 
   mkA = overload {
     mkA : Str -> A = \s -> lin A (regAdj s) ;
-    mkA : Str -> A -> A = \s,a -> irregAdvAdj s a 
+    mkA : Str -> A -> A = \s,a -> lin A (irregAdvAdj s a) 
   } ;
 
   mkA2 : Str -> Prep -> A2 = \s,pp -> lin A2 (regAdj s ** { compl = pp }) ;
@@ -101,7 +104,7 @@ oper
   mkV2A : Str -> V2A = \s -> lin V2A (mkVerbDu s) ;  -- Nor-nork   
   mkVQ : Str -> VQ = \s -> lin VQ (mkVerbDu s) ;  -- Nor-nork 
   mkVS : Str -> VS = \s -> lin VS (mkVerbDu s) ;  -- Nor-nork
-
+  mkVV : V -> VV = \v -> lin VV v ;
 
   mkV2V : Str -> V2V = \s -> lin V2V (mkVerbDio s) ; -- ??? TODO check valency
   mkV2S : Str -> V2S = \s -> lin V2S (mkVerbDio s) ; -- Nor-nori-nork: (mutilari) (neska datorrela) erantzun diot
@@ -113,15 +116,15 @@ oper
   -- Verbs with non-inflecting participle
   -- These are just Verb, use izanV or egonV for intransitive and ukanV for transitive.
 
-  izanV : Str -> Verb = \bizi -> 
-    mkVerbDa bizi ** { prc = \\_ => bizi } ; -- Non-inflecting participle, auxtype is Da (nor): e.g. "bizi naiz", "beldur naiz"
+  izanV : Str -> V = \bizi ->
+    lin V (mkVerbDa bizi ** { prc = \\_ => bizi }) ; -- Non-inflecting participle, auxtype is Da (nor): e.g. "bizi naiz", "beldur naiz"
 
-  egonV : Str -> Verb = \zain -> 
-    mkVerbDaEgon zain ** { prc = \\_ => zain } ; -- Non-inflecting participle, auxtype is Da (nor), but with egon: e.g. "zain nago"
+  egonV : Str -> V = \zain ->
+    lin V (mkVerbDaEgon zain ** { prc = \\_ => zain }) ; -- Non-inflecting participle, auxtype is Da (nor), but with egon: e.g. "zain nago"
 
 
-  ukanV : Str -> Verb = \maite -> 
-    mkVerbDu maite ** { prc = \\_ => maite } ; -- Non-inflecting participle, auxtype is Du (nor-nork): e.g, "maite zaitut"
+  ukanV : Str -> V = \maite ->
+    lin V (mkVerbDu maite ** { prc = \\_ => maite }) ; -- Non-inflecting participle, auxtype is Du (nor-nork): e.g, "maite zaitut"
 
 
 --2 Structural categories
@@ -154,6 +157,10 @@ oper
 
   mkAdA : Str -> AdA = \s -> lin AdA {s = s} ;
 
+  oper mkAdN : Str -> AdN = \s -> lin AdN {s=s} ;
+
+  oper mkInterj : Str -> Interj = \s -> lin Interj {s=s} ;
+  oper mkVoc : Str -> Voc = \s -> lin Voc {s=s} ;
 
 --.
 -------------------------------------------------------------------------------

src/belarusian/AdjectiveBel.gf

@@ -0,0 +1,4 @@
+concrete AdjectiveBel of Adjective = CatBel ** {
+lin
+  PositA a = a ;
+}

src/belarusian/AllBel.gf

@@ -0,0 +1,4 @@
+concrete AllBel of AllBelAbs =
+  LangBel
+  **
+    {} ;

src/belarusian/AllBelAbs.gf

@@ -0,0 +1,3 @@
+abstract AllBelAbs =
+  Lang
+  ** {}

src/belarusian/CatBel.gf

@@ -0,0 +1,21 @@
+concrete CatBel of Cat = CommonX ** open ResBel in {
+
+lincat N = Noun ;
+lincat N2 = Noun ** {c2 : Compl} ;
+lincat N3 = Noun ** {c2,c3 : Compl} ;
+lincat V = V ;
+lincat VV,VS,VQ,VA = V ;
+lincat V2 = V ** {c2 : Compl} ;
+lincat V3,V2A,V2S,V2Q,V2V = V ** {c2,c3 : Compl} ;
+lincat A = A ;
+lincat A2 = A ** {c2 : Compl} ;
+lincat Prep = Compl ;
+lincat CN = CommonNoun ;
+lincat AP = AdjPhrase ;
+lincat S = {s : Str} ;
+
+lincat LN,SN,GN,PN = {s : Str} ;
+
+linref V,VV,V2,V3,V2A,V2S,V2Q,V2V = \v -> v.infinitive ;
+
+}

src/belarusian/DocumentationBel.gf

@@ -0,0 +1,77 @@
+concrete DocumentationBel of Documentation = CatBel ** open
+  ResBel, Prelude, HTML in {
+
+lincat
+  Inflection = {t : Str; s1,s2,s3 : Str} ;
+  Definition = {s : Str} ;
+  Document   = {s : Str} ;
+  Tag        = {s : Str} ;
+
+lin
+  InflectionN,InflectionN2,InflectionN3 = \x -> {
+      t="n" ;
+      s1="" ;
+      s2=frameTable (
+           tr (th ""      ++ th "Sg"             ++ th "Pl") ++
+           tr (th "Nom"   ++ td (x.s ! Nom ! Sg) ++ td (x.s ! Nom ! Pl)) ++
+           tr (th "Acc"   ++ td (x.s ! Acc ! Sg) ++ td (x.s ! Acc ! Pl)) ++
+           tr (th "Dat"   ++ td (x.s ! Dat ! Sg) ++ td (x.s ! Dat ! Pl)) ++
+           tr (th "Gen"   ++ td (x.s ! Gen ! Sg) ++ td (x.s ! Gen ! Pl)) ++
+           tr (th "Loc"   ++ td (x.s ! Loc ! Sg) ++ td (x.s ! Loc ! Pl)) ++
+           tr (th "Instr" ++ td (x.s ! Instr ! Sg) ++ td (x.s ! Instr ! Pl))) ;
+      s3=[]
+    } ;
+lin
+  InflectionV,InflectionV2,InflectionV2A,InflectionV2Q,InflectionV2S,InflectionV2V,InflectionV3,InflectionVA,InflectionVQ,InflectionVS,InflectionVV = \x -> {
+      t="v" ;
+      s1="" ;
+      s2=heading1 "Infinitive" ++
+         paragraph (x.infinitive) ++
+         heading1 "Present" ++
+         frameTable (
+           tr (intagAttr "th" "rowspan=\"6\"" "Pres" ++ intagAttr "th" "rowspan=\"2\"" "P1" ++ th "Sg" ++ td ((x.active ! Imperf).Pres ! P1 ! Sg)) ++
+           tr (th "Pl" ++ td ((x.active ! Imperf).Pres ! P1 ! Pl)) ++
+           tr (intagAttr "th" "rowspan=\"2\"" "P2" ++ th "Sg" ++ td ((x.active ! Imperf).Pres ! P2 ! Sg)) ++
+           tr (th "Pl" ++ td ((x.active ! Imperf).Pres ! P2 ! Pl)) ++
+           tr (intagAttr "th" "rowspan=\"2\"" "P3" ++ th "Sg" ++ td ((x.active ! Imperf).Pres ! P3 ! Sg)) ++
+           tr (th "Pl" ++ td ((x.active ! Imperf).Pres ! P3 ! Pl))) ++
+         heading1 "Imperative" ++
+         frameTable (
+           tr (th "Sg" ++ td (x.imperative ! Sg)) ++
+           tr (th "Pl" ++ td (x.imperative ! Pl))) ++
+         heading1 "participle" ++
+         frameTable (
+           tr (th "" ++ th "Sg" ++ th "Pl") ++
+           tr (th "Masc"   ++ td (x.participle ! Masc   ! Sg) ++ td (x.participle ! Masc   ! Pl)) ++
+           tr (th "Fem"    ++ td (x.participle ! Fem    ! Sg) ++ td (x.participle ! Fem    ! Pl)) ++
+           tr (th "Neuter" ++ td (x.participle ! Neuter ! Sg) ++ td (x.participle ! Neuter ! Pl))) ;
+      s3=[]
+    } ;
+lin
+  InflectionA,InflectionA2 = \x -> {
+      t="a" ;
+      s1="" ;
+      s2=frameTable (
+           tr (th ""    ++ th "Masc"                 ++ th "Fem"                 ++ th "Neuter"                 ++ th "Pl") ++ 
+           tr (th "Nom" ++ td (x.s ! Nom ! GSg Masc) ++ td (x.s ! Nom ! GSg Fem) ++ td (x.s ! Nom ! GSg Neuter) ++ td (x.s ! Nom ! GPl)) ++
+           tr (th "Acc" ++ td (x.s ! Acc ! GSg Masc) ++ td (x.s ! Acc ! GSg Fem) ++ td (x.s ! Acc ! GSg Neuter) ++ td (x.s ! Acc ! GPl)) ++
+           tr (th "Dat" ++ td (x.s ! Dat ! GSg Masc) ++ td (x.s ! Dat ! GSg Fem) ++ td (x.s ! Dat ! GSg Neuter) ++ td (x.s ! Dat ! GPl)) ++
+           tr (th "Gen" ++ td (x.s ! Gen ! GSg Masc) ++ td (x.s ! Gen ! GSg Fem) ++ td (x.s ! Gen ! GSg Neuter) ++ td (x.s ! Gen ! GPl)) ++
+           tr (th "Loc" ++ td (x.s ! Loc ! GSg Masc) ++ td (x.s ! Loc ! GSg Fem) ++ td (x.s ! Loc ! GSg Neuter) ++ td (x.s ! Loc ! GPl)) ++
+           tr (th "Instr"++td (x.s ! Instr ! GSg Masc)++td (x.s ! Instr ! GSg Fem)++td (x.s ! Instr ! GSg Neuter)++td (x.s ! Instr ! GPl))) ;
+      s3=[]
+    } ;
+lin
+  InflectionAdA,InflectionAdN,InflectionAdV,InflectionAdv = \x -> {t="adv"; s1=""; s2=x.s; s3=""} ;
+
+  InflectionPrep = \x -> {t="prep"; s1=""; s2=x.s; s3=""} ;
+
+lin
+  NoDefinition   t     = {s=t.s};
+  MkDefinition   t d   = {s="<p><b>Definition:</b>"++t.s++d.s++"</p>"};
+  MkDefinitionEx t d e = {s="<p><b>Definition:</b>"++t.s++d.s++"</p><p><b>Example:</b>"++e.s++"</p>"};
+
+lin
+  MkDocument d i e = {s = i.s1 ++ d.s ++ i.s2 ++ i.s3 ++ e.s} ;
+  MkTag i = {s = i.t} ;
+}

src/belarusian/GrammarBel.gf

@@ -0,0 +1,6 @@
+concrete GrammarBel of Grammar =
+  TenseX,
+  PhraseBel,
+  NounBel,
+  AdjectiveBel ** {
+}

src/belarusian/LangBel.gf

@@ -0,0 +1,10 @@
+--# -path=.:../abstract
+concrete LangBel of Lang =
+  GrammarBel,
+  LexiconBel
+  ,DocumentationBel --# notpresent
+  ** {
+
+flags startcat = Phr ;
+
+}

src/belarusian/LexiconBel.gf

@@ -0,0 +1,2 @@
+concrete LexiconBel of Lexicon = CatBel ** open ParadigmsBel in {
+}

src/belarusian/NounBel.gf

@@ -0,0 +1,4 @@
+concrete NounBel of Noun = CatBel ** {
+lin
+  UseN n = n ;
+}

src/belarusian/ParadigmsBel.gf

@@ -0,0 +1,842 @@
+resource ParadigmsBel = MorphoBel  ** open Predef, Prelude, CatBel, ResBel in {
+oper
+  regN : Str -> N   -- s;Nom;Sg
+    = \form -> case form of {
+		_ + "цат" => mkN056 form;
+		_ + "фат" => mkN099 form;
+		_ + "бат" => mkN131 form;
+		_ + "ват" => mkN131 form;
+		_ + "кат" => mkN131 form;
+		_ + "энт" => mkN131 form;
+		_ + "онт" => mkN056 form;
+		_ + "ікт" => mkN056 form;
+		_ + "укт" => mkN056 form;
+		_ + "сіт" => mkN131 form;
+		_ + "біт" => mkN131 form;
+		_ + "ірт" => mkN205 form;
+		_ + "ост" => mkN056 form;
+		_ + "уст" => mkN125 form;
+		_ + "эфт" => mkN056 form;
+		_ + "нёт" => mkN056 form;
+		_ + "ыёт" => mkN131 form;
+		_ + "аэт" => mkN131 form;
+		_ + "цэт" => mkN131 form;
+		_ + "чыт" => mkN125 form;
+		_ + "гут" => mkN125 form;
+		_ + "'ят" => mkN131 form;
+		_ + "лец" => mkN002 form;
+		_ + "аец" => mkN235 form;
+		_ + "еец" => mkN235 form;
+		_ + "ыец" => mkN235 form;
+		_ + "іец" => mkN235 form;
+		_ + "зец" => mkN265 form;
+		_ + "вец" => mkN300 form;
+		_ + "рац" => mkN286 form;
+		_ + "рка" => mkN003 form;
+		_ + "іка" => mkN003 form;
+		_ + "ека" => mkN003 form;
+		_ + "ыка" => mkN003 form;
+		_ + "ўка" => mkN217 form;
+		_ + "ука" => mkN026 form;
+		_ + "эка" => mkN026 form;
+		_ + "ока" => mkN026 form;
+		_ + "ака" => mkN026 form;
+		_ + "яка" => mkN026 form;
+		_ + "йка" => mkN124 form;
+		_ + "ька" => mkN196 form;
+		_ + "ква" => mkN039 form;
+		_ + "ова" => mkN150 form;
+		_ + "зва" => mkN039 form;
+		_ + "хва" => mkN039 form;
+		_ + "рва" => mkN039 form;
+		_ + "ева" => mkN138 form;
+		_ + "ява" => mkN150 form;
+		_ + "эва" => mkN166 form;
+		_ + "уза" => mkN012 form;
+		_ + "аза" => mkN012 form;
+		_ + "нза" => mkN012 form;
+		_ + "еза" => mkN024 form;
+		_ + "ўза" => mkN039 form;
+		_ + "яза" => mkN187 form;
+		_ + "іма" => mkN012 form;
+		_ + "ома" => mkN012 form;
+		_ + "ьма" => mkN091 form;
+		_ + "чма" => mkN215 form;
+		_ + "ьба" => mkN012 form;
+		_ + "аба" => mkN012 form;
+		_ + "ыба" => mkN012 form;
+		_ + "ёба" => mkN024 form;
+		_ + "жба" => mkN039 form;
+		_ + "чба" => mkN039 form;
+		_ + "ўба" => mkN091 form;
+		_ + "ўна" => mkN012 form;
+		_ + "ына" => mkN012 form;
+		_ + "ана" => mkN012 form;
+		_ + "рна" => mkN012 form;
+		_ + "дна" => mkN024 form;
+		_ + "нна" => mkN039 form;
+		_ + "яна" => mkN061 form;
+		_ + "уна" => mkN091 form;
+		_ + "спа" => mkN012 form;
+		_ + "лпа" => mkN083 form;
+		_ + "гла" => mkN012 form;
+		_ + "ула" => mkN188 form;
+		_ + "ёла" => mkN012 form;
+		_ + "іла" => mkN188 form;
+		_ + "ела" => mkN188 form;
+		_ + "яла" => mkN091 form;
+		_ + "сла" => mkN260 form;
+		_ + "ыса" => mkN012 form;
+		_ + "оса" => mkN024 form;
+		_ + "йга" => mkN020 form;
+		_ + "рга" => mkN061 form;
+		_ + "ьга" => mkN088 form;
+		_ + "ята" => mkN245 form;
+		_ + "ыта" => mkN245 form;
+		_ + "дра" => mkN102 form;
+		_ + "тра" => mkN080 form;
+		_ + "бра" => mkN080 form;
+		_ + "ўра" => mkN099 form;
+		_ + "кра" => mkN102 form;
+		_ + "ыца" => mkN137 form;
+		_ + "ўца" => mkN137 form;
+		_ + "дца" => mkN078 form;
+		_ + "йца" => mkN078 form;
+		_ + "чца" => mkN078 form;
+		_ + "нца" => mkN080 form;
+		_ + "рца" => mkN080 form;
+		_ + "сца" => mkN080 form;
+		_ + "ржа" => mkN064 form;
+		_ + "жжа" => mkN080 form;
+		_ + "джа" => mkN102 form;
+		_ + "ыча" => mkN036 form;
+		_ + "эча" => mkN036 form;
+		_ + "яча" => mkN064 form;
+		_ + "чча" => mkN080 form;
+		_ + "нча" => mkN102 form;
+		_ + "оха" => mkN309 form;
+		_ + "ьха" => mkN309 form;
+		_ + "зык" => mkN005 form;
+		_ + "мык" => mkN005 form;
+		_ + "тык" => mkN043 form;
+		_ + "аяк" => mkN005 form;
+		_ + "пяк" => mkN005 form;
+		_ + "ляк" => mkN063 form;
+		_ + "мак" => mkN006 form;
+		_ + "пак" => mkN006 form;
+		_ + "шак" => mkN006 form;
+		_ + "сак" => mkN006 form;
+		_ + "вак" => mkN063 form;
+		_ + "зак" => mkN251 form;
+		_ + "вік" => mkN005 form;
+		_ + "лік" => mkN043 form;
+		_ + "вук" => mkN006 form;
+		_ + "цук" => mkN006 form;
+		_ + "рук" => mkN043 form;
+		_ + "шук" => mkN043 form;
+		_ + "нук" => mkN063 form;
+		_ + "чук" => mkN328 form;
+		_ + "шок" => mkN015 form;
+		_ + "мок" => mkN063 form;
+		_ + "чок" => mkN015 form;
+		_ + "нок" => mkN015 form;
+		_ + "рэк" => mkN063 form;
+		_ + "цуг" => mkN005 form;
+		_ + "раг" => mkN063 form;
+		_ + "онг" => mkN008 form;
+		_ + "рог" => mkN337 form;
+		_ + "лог" => mkN200 form;
+		_ + "жух" => mkN005 form;
+		_ + "тух" => mkN063 form;
+		_ + "нах" => mkN063 form;
+		_ + "віч" => mkN062 form;
+		_ + "нач" => mkN184 form;
+		_ + "ршч" => mkN204 form;
+		_ + "пыр" => mkN334 form;
+		_ + "лор" => mkN007 form;
+		_ + "рор" => mkN042 form;
+		_ + "пор" => mkN059 form;
+		_ + "хор" => mkN155 form;
+		_ + "фар" => mkN007 form;
+		_ + "нар" => mkN007 form;
+		_ + "хар" => mkN019 form;
+		_ + "гар" => mkN019 form;
+		_ + "вар" => mkN042 form;
+		_ + "жар" => mkN042 form;
+		_ + "сір" => mkN062 form;
+		_ + "пір" => mkN062 form;
+		_ + "хір" => mkN365 form;
+		_ + "гір" => mkN365 form;
+		_ + "кер" => mkN007 form;
+		_ + "мер" => mkN042 form;
+		_ + "лер" => mkN042 form;
+		_ + "нер" => mkN062 form;
+		_ + "вер" => mkN174 form;
+		_ + "ґер" => mkN127 form;
+		_ + "цэр" => mkN062 form;
+		_ + "шэр" => mkN062 form;
+		_ + "дэр" => mkN062 form;
+		_ + "гур" => mkN062 form;
+		_ + "чур" => mkN062 form;
+		_ + "аўр" => mkN334 form;
+		_ + "ыгр" => mkN334 form;
+		_ + "даж" => mkN034 form;
+		_ + "гаж" => mkN071 form;
+		_ + "ыум" => mkN031 form;
+		_ + "нос" => mkN013 form;
+		_ + "пус" => mkN009 form;
+		_ + "лас" => mkN009 form;
+		_ + "рас" => mkN045 form;
+		_ + "лёс" => mkN011 form;
+		_ + "цыс" => mkN013 form;
+		_ + "нес" => mkN045 form;
+		_ + "зіс" => mkN045 form;
+		_ + "вол" => mkN035 form;
+		_ + "рол" => mkN159 form;
+		_ + "пел" => mkN011 form;
+		_ + "рал" => mkN013 form;
+		_ + "дал" => mkN013 form;
+		_ + "кал" => mkN013 form;
+		_ + "сал" => mkN013 form;
+		_ + "сул" => mkN013 form;
+		_ + "мул" => mkN045 form;
+		_ + "нёл" => mkN013 form;
+		_ + "вон" => mkN009 form;
+		_ + "рон" => mkN011 form;
+		_ + "лон" => mkN011 form;
+		_ + "зон" => mkN011 form;
+		_ + "аон" => mkN013 form;
+		_ + "зан" => mkN013 form;
+		_ + "бан" => mkN195 form;
+		_ + "зін" => mkN011 form;
+		_ + "фін" => mkN013 form;
+		_ + "він" => mkN013 form;
+		_ + "рэн" => mkN011 form;
+		_ + "зын" => mkN011 form;
+		_ + "лын" => mkN214 form;
+		_ + "іян" => mkN013 form;
+		_ + "лян" => mkN045 form;
+		_ + "цян" => mkN195 form;
+		_ + "жун" => mkN195 form;
+		_ + "кун" => mkN195 form;
+		_ + "сун" => mkN195 form;
+		_ + "пун" => mkN366 form;
+		_ + "лаб" => mkN009 form;
+		_ + "ваб" => mkN011 form;
+		_ + "раб" => mkN013 form;
+		_ + "арб" => mkN045 form;
+		_ + "цай" => mkN022 form;
+		_ + "гай" => mkN117 form;
+		_ + "тай" => mkN117 form;
+		_ + "чай" => mkN305 form;
+		_ + "бой" => mkN017 form;
+		_ + "рой" => mkN022 form;
+		_ + "пой" => mkN305 form;
+		_ + "зей" => mkN022 form;
+		_ + "куй" => mkN099 form;
+		_ + "мыз" => mkN011 form;
+		_ + "цуз" => mkN013 form;
+		_ + "буз" => mkN214 form;
+		_ + "куп" => mkN013 form;
+		_ + "чуп" => mkN045 form;
+		_ + "ноп" => mkN035 form;
+		_ + "хоп" => mkN045 form;
+		_ + "льф" => mkN011 form;
+		_ + "орф" => mkN011 form;
+		_ + "сад" => mkN037 form;
+		_ + "гад" => mkN037 form;
+		_ + "айд" => mkN037 form;
+		_ + "код" => mkN037 form;
+		_ + "лод" => mkN048 form;
+		_ + "луд" => mkN048 form;
+		_ + "пед" => mkN037 form;
+		_ + "зед" => mkN081 form;
+		_ + "оід" => mkN037 form;
+		_ + "туш" => mkN034 form;
+		_ + "рыш" => mkN062 form;
+		_ + "дло" => mkN278 form;
+		_ + "яло" => mkN278 form;
+		_ + "бло" => mkN278 form;
+		_ + "ало" => mkN316 form;
+		_ + "іно" => mkN061 form;
+		_ + "гно" => mkN278 form;
+		_ + "тно" => mkN316 form;
+		_ + "дро" => mkN246 form;
+		_ + "яро" => mkN246 form;
+		_ + "шкі" => mkN242 form;
+		_ + "ані" => mkN088 form;
+		_ + "дні" => mkN241 form;
+		_ + "уры" => mkN061 form;
+		_ + "юты" => mkN181 form;
+		_ + "оны" => mkN145 form;
+		_ + "чны" => mkN181 form;
+		_ + "ены" => mkN291 form;
+		_ + "аны" => mkN291 form;
+		_ + "нны" => mkN291 form;
+		_ + "іцы" => mkN145 form;
+		_ + "ёды" => mkN145 form;
+		_ + "зія" => mkN133 form;
+		_ + "хія" => mkN133 form;
+		_ + "лея" => mkN133 form;
+		_ + "ель" => mkN237 form;
+		_ + "унь" => mkN164 form;
+		_ + "энь" => mkN164 form;
+		_ + "ань" => mkN164 form;
+		_ + "онь" => mkN164 form;
+		_ + "азь" => mkN100 form;
+		_ + "дзь" => mkN152 form;
+		_ + "ось" => mkN375 form;
+		_ + "ась" => mkN375 form;
+		_ + "яць" => mkN325 form;
+		_ + "уць" => mkN325 form;
+		_ + "іць" => mkN325 form;
+		_ + "іт" => mkN056 form;
+		_ + "рт" => mkN056 form;
+		_ + "ст" => mkN131 form;
+		_ + "ыт" => mkN056 form;
+		_ + "ят" => mkN056 form;
+		_ + "лт" => mkN056 form;
+		_ + "шт" => mkN056 form;
+		_ + "нц" => mkN042 form;
+		_ + "яц" => mkN046 form;
+		_ + "ац" => mkN046 form;
+		_ + "ва" => mkN024 form;
+		_ + "за" => mkN016 form;
+		_ + "ма" => mkN016 form;
+		_ + "ба" => mkN016 form;
+		_ + "на" => mkN016 form;
+		_ + "па" => mkN016 form;
+		_ + "ла" => mkN024 form;
+		_ + "са" => mkN016 form;
+		_ + "га" => mkN021 form;
+		_ + "та" => mkN023 form;
+		_ + "ра" => mkN036 form;
+		_ + "ца" => mkN036 form;
+		_ + "жа" => mkN036 form;
+		_ + "ша" => mkN036 form;
+		_ + "ча" => mkN297 form;
+		_ + "эа" => mkN061 form;
+		_ + "да" => mkN087 form;
+		_ + "ха" => mkN114 form;
+		_ + "ык" => mkN063 form;
+		_ + "як" => mkN006 form;
+		_ + "ак" => mkN178 form;
+		_ + "юк" => mkN006 form;
+		_ + "ок" => mkN043 form;
+		_ + "ск" => mkN043 form;
+		_ + "ўк" => mkN044 form;
+		_ + "ёк" => mkN122 form;
+		_ + "уг" => mkN115 form;
+		_ + "рг" => mkN008 form;
+		_ + "аг" => mkN008 form;
+		_ + "яг" => mkN008 form;
+		_ + "зг" => mkN030 form;
+		_ + "ог" => mkN105 form;
+		_ + "ег" => mkN200 form;
+		_ + "іх" => mkN006 form;
+		_ + "эх" => mkN008 form;
+		_ + "ях" => mkN113 form;
+		_ + "рч" => mkN007 form;
+		_ + "іч" => mkN007 form;
+		_ + "юч" => mkN034 form;
+		_ + "яч" => mkN034 form;
+		_ + "шч" => mkN034 form;
+		_ + "ыч" => mkN034 form;
+		_ + "еч" => mkN184 form;
+		_ + "эч" => mkN184 form;
+		_ + "ыр" => mkN019 form;
+		_ + "ар" => mkN062 form;
+		_ + "ір" => mkN007 form;
+		_ + "яр" => mkN019 form;
+		_ + "юр" => mkN042 form;
+		_ + "гр" => mkN062 form;
+		_ + "ёр" => mkN062 form;
+		_ + "аж" => mkN062 form;
+		_ + "ож" => mkN059 form;
+		_ + "ўж" => mkN155 form;
+		_ + "рж" => mkN155 form;
+		_ + "дж" => mkN204 form;
+		_ + "ам" => mkN031 form;
+		_ + "ум" => mkN045 form;
+		_ + "ьм" => mkN031 form;
+		_ + "ім" => mkN031 form;
+		_ + "йм" => mkN031 form;
+		_ + "ём" => mkN031 form;
+		_ + "юм" => mkN031 form;
+		_ + "эм" => mkN045 form;
+		_ + "яс" => mkN009 form;
+		_ + "ёс" => mkN045 form;
+		_ + "нс" => mkN045 form;
+		_ + "рс" => mkN045 form;
+		_ + "эс" => mkN045 form;
+		_ + "ыл" => mkN011 form;
+		_ + "ел" => mkN330 form;
+		_ + "эл" => mkN045 form;
+		_ + "іл" => mkN013 form;
+		_ + "ёл" => mkN018 form;
+		_ + "ін" => mkN239 form;
+		_ + "эн" => mkN013 form;
+		_ + "рн" => mkN011 form;
+		_ + "ын" => mkN013 form;
+		_ + "ен" => mkN013 form;
+		_ + "ун" => mkN214 form;
+		_ + "рб" => mkN035 form;
+		_ + "ўб" => mkN035 form;
+		_ + "юб" => mkN045 form;
+		_ + "уб" => mkN050 form;
+		_ + "ыб" => mkN050 form;
+		_ + "ей" => mkN017 form;
+		_ + "яй" => mkN017 form;
+		_ + "эй" => mkN022 form;
+		_ + "уй" => mkN067 form;
+		_ + "ыз" => mkN045 form;
+		_ + "оз" => mkN057 form;
+		_ + "уп" => mkN050 form;
+		_ + "ап" => mkN013 form;
+		_ + "ўп" => mkN045 form;
+		_ + "ып" => mkN045 form;
+		_ + "іф" => mkN045 form;
+		_ + "рд" => mkN037 form;
+		_ + "юд" => mkN081 form;
+		_ + "зд" => mkN082 form;
+		_ + "ьв" => mkN120 form;
+		_ + "аш" => mkN034 form;
+		_ + "уш" => mkN046 form;
+		_ + "рш" => mkN046 form;
+		_ + "ўш" => mkN059 form;
+		_ + "ро" => mkN061 form;
+		_ + "кі" => mkN322 form;
+		_ + "ні" => mkN099 form;
+		_ + "ці" => mkN099 form;
+		_ + "лі" => mkN241 form;
+		_ + "гі" => mkN242 form;
+		_ + "ыё" => mkN061 form;
+		_ + "нё" => mkN433 form;
+		_ + "ье" => mkN061 form;
+		_ + "ае" => mkN361 form;
+		_ + "ры" => mkN145 form;
+		_ + "ты" => mkN145 form;
+		_ + "шы" => mkN181 form;
+		_ + "бы" => mkN291 form;
+		_ + "лы" => mkN291 form;
+		_ + "чы" => mkN291 form;
+		_ + "мы" => mkN291 form;
+		_ + "мя" => mkN092 form;
+		_ + "бя" => mkN092 form;
+		_ + "оя" => mkN133 form;
+		_ + "ця" => mkN154 form;
+        _ + "ка" => mkN004 form;
+		_ + "ль" => mkN100 form;
+		_ + "нь" => mkN100 form;
+		_ + "зь" => mkN410 form;
+		_ + "сь" => mkN116 form;
+		_ + "ыў" => mkN252 form;
+		_ + "еў" => mkN252 form;
+		_ + "т" => mkN032 form;
+		_ + "ц" => mkN127 form;
+		_ + "к" => mkN008 form;
+		_ + "г" => mkN043 form;
+		_ + "х" => mkN043 form;
+		_ + "ч" => mkN019 form;
+		_ + "р" => mkN046 form;
+		_ + "ж" => mkN046 form;
+		_ + "м" => mkN011 form;
+		_ + "с" => mkN031 form;
+		_ + "л" => mkN031 form;
+		_ + "н" => mkN031 form;
+		_ + "б" => mkN031 form;
+		_ + "й" => mkN010 form;
+		_ + "з" => mkN031 form;
+		_ + "п" => mkN031 form;
+		_ + "ф" => mkN031 form;
+		_ + "д" => mkN027 form;
+		_ + "в" => mkN031 form;
+		_ + ("яляш"|"ялюш") => mkN243 form;
+		_ + "о" => mkN055 form;
+		_ + "і" => mkN061 form;
+		_ + "э" => mkN061 form;
+		_ + "ё" => mkN230 form;
+		_ + "ю" => mkN061 form;
+		_ + "е" => mkN201 form;
+		_ + "ы" => mkN283 form;
+		_ + "я" => mkN206 form;
+		_ + "у" => mkN088 form;
+		_ + "ь" => mkN262 form;
+		_ + "o" => mkN144 form;
+		_ + "ў" => mkN351 form;
+		_ => error "Cannot find an inflection rule"
+  } ;
+
+  reg2N : Str -> Str -> N   -- s;Nom;Sg  s;Acc;Pl
+    = \form1, form2 -> case <form1, form2> of {
+		<_ + "мак", _ + "мкі"> => mkN178 form1;
+		<_ + "ана", _ + "оны"> => mkN070 form1;
+		<_ + "ана", _ + "эны"> => mkN182 form1;
+		<_ + "нер", _ + "яры"> => mkN069 form1;
+		<_ + "ель", _ + "блі"> => mkN118 form1;
+		<_ + "ель", _ + "флі"> => mkN179 form1;
+		<_ + "ань", _ + "жні"> => mkN177 form1;
+		<_ + "раб", _ + "оў"> => mkN195 form1;
+		<_ + "вак", _ + "оў"> => mkN328 form1;
+		<_ + "вец", _ + "оў"> => mkN420 form1;
+		<_ + "рка", _ + "і"> => mkN004 form1;
+		<_ + "іка", _ + "і"> => mkN026 form1;
+		<_ + "ека", _ + "і"> => mkN256 form1;
+		<_ + "ыка", _ + "і"> => mkN026 form1;
+		<_ + "ыка", _ + "ў"> => mkN129 form1;
+		<_ + "ўка", _ + "к"> => mkN161 form1;
+		<_ + "зык", _ + "ў"> => mkN006 form1;
+		<_ + "мак", _ + "і"> => mkN005 form1;
+		<_ + "пак", _ + "і"> => mkN005 form1;
+		<_ + "шок", _ + "і"> => mkN008 form1;
+		<_ + "лік", _ + "ў"> => mkN063 form1;
+		<_ + "нос", _ + "ы"> => mkN009 form1;
+		<_ + "гай", _ + "і"> => mkN010 form1;
+		<_ + "льф", _ + "ы"> => mkN031 form1;
+		<_ + "рон", _ + "ў"> => mkN013 form1;
+		<_ + "лон", _ + "ў"> => mkN029 form1;
+		<_ + "лон", _ + "ы"> => mkN045 form1;
+		<_ + "лёс", _ + "ы"> => mkN045 form1;
+		<_ + "зін", _ + "ы"> => mkN031 form1;
+		<_ + "уза", _ + "ы"> => mkN091 form1;
+		<_ + "аза", _ + "ы"> => mkN016 form1;
+		<_ + "аза", _ + "з"> => mkN139 form1;
+		<_ + "ьба", _ + "ы"> => mkN016 form1;
+		<_ + "іма", _ + "ы"> => mkN091 form1;
+		<_ + "ына", _ + "ы"> => mkN016 form1;
+		<_ + "спа", _ + "ы"> => mkN039 form1;
+		<_ + "ана", _ + "ы"> => mkN016 form1;
+		<_ + "гла", _ + "ы"> => mkN356 form1;
+		<_ + "аба", _ + "ы"> => mkN016 form1;
+		<_ + "ула", _ + "л"> => mkN012 form1;
+		<_ + "ула", _ + "ы"> => mkN016 form1;
+		<_ + "ыса", _ + "ы"> => mkN016 form1;
+		<_ + "рна", _ + "ы"> => mkN091 form1;
+		<_ + "раб", _ + "ы"> => mkN031 form1;
+		<_ + "іян", _ + "ы"> => mkN031 form1;
+		<_ + "цыс", _ + "ы"> => mkN031 form1;
+		<_ + "мок", _ + "і"> => mkN015 form1;
+		<_ + "іла", _ + "ы"> => mkN016 form1;
+		<_ + "ела", _ + "ы"> => mkN016 form1;
+		<_ + "ова", _ + "ў"> => mkN138 form1;
+		<_ + "вол", _ + "ў"> => mkN029 form1;
+		<_ + "дра", _ + "ў"> => mkN141 form1;
+		<_ + "гад", _ + "ў"> => mkN081 form1;
+		<_ + "зва", _ + "ў"> => mkN083 form1;
+		<_ + "рва", _ + "ў"> => mkN083 form1;
+		<_ + "вар", _ + "ў"> => mkN062 form1;
+		<_ + "рук", _ + "ў"> => mkN328 form1;
+		<_ + "нер", _ + "ы"> => mkN046 form1;
+		<_ + "ост", _ + "ы"> => mkN054 form1;
+		<_ + "энт", _ + "ы"> => mkN056 form1;
+		<_ + "вер", _ + "ў"> => mkN062 form1;
+		<_ + "раг", _ + "і"> => mkN115 form1;
+		<_ + "ўца", _ + "ў"> => mkN078 form1;
+		<_ + "бра", _ + "ы"> => mkN102 form1;
+		<_ + "ьма", _ + "ў"> => mkN083 form1;
+		<_ + "ель", _ + "і"> => mkN100 form1;
+		<_ + "рог", _ + "і"> => mkN105 form1;
+		<_ + "рог", _ + "ў"> => mkN339 form1;
+		<_ + "унь", _ + "і"> => mkN121 form1;
+		<_ + "йка", _ + "к"> => mkN160 form1;
+		<_ + "ька", _ + "ў"> => mkN129 form1;
+		<_ + "ька", _ + "і"> => mkN197 form1;
+		<_ + "яць", _ + "ў"> => mkN132 form1;
+		<_ + "ось", _ + "ў"> => mkN152 form1;
+		<_ + "зак", _ + "ў"> => mkN191 form1;
+		<_ + "ар", _ + "тры"> => mkN373 form1;
+		<_ + "ок", _ + "ркі"> => mkN015 form1;
+		<_ + "ок", _ + "ткі"> => mkN015 form1;
+		<_ + "ок", _ + "акі"> => mkN030 form1;
+		<_ + "ва", _ + "івы"> => mkN150 form1;
+		<_ + "ла", _ + "элы"> => mkN182 form1;
+		<_ + "ла", _ + "ылы"> => mkN188 form1;
+		<_ + "са", _ + "осы"> => mkN070 form1;
+		<_ + "ел", _ + "елы"> => mkN031 form1;
+		<_ + "ль", _ + "злі"> => mkN177 form1;
+		<_ + "нь", _ + "дні"> => mkN173 form1;
+		<_ + "нь", _ + "ўні"> => mkN175 form1;
+		<_ + "нь", _ + "сні"> => mkN179 form1;
+		<_ + "нь", _ + "пні"> => mkN179 form1;
+		<_ + "нь", _ + "яні"> => mkN400 form1;
+		<_ + "ак", _ + "оў"> => mkN006 form1;
+		<_ + "ык", _ + "оў"> => mkN006 form1;
+		<_ + "як", _ + "аў"> => mkN063 form1;
+		<_ + "ар", _ + "оў"> => mkN019 form1;
+		<_ + "ла", _ + "ол"> => mkN139 form1;
+		<_ + "ын", _ + "оў"> => mkN038 form1;
+		<_ + "яр", _ + "аў"> => mkN062 form1;
+		<_ + "іт", _ + "ты"> => mkN032 form1;
+		<_ + "ль", _ + "ёў"> => mkN203 form1;
+		<_ + "ак", _ + "ў"> => mkN276 form1;
+		<_ + "ык", _ + "і"> => mkN008 form1;
+		<_ + "ыр", _ + "ы"> => mkN034 form1;
+		<_ + "ір", _ + "ы"> => mkN042 form1;
+		<_ + "ар", _ + "ы"> => mkN046 form1;
+		<_ + "аг", _ + "ў"> => mkN063 form1;
+		<_ + "эх", _ + "ў"> => mkN063 form1;
+		<_ + "ма", _ + "м"> => mkN012 form1;
+		<_ + "на", _ + "н"> => mkN012 form1;
+		<_ + "ба", _ + "б"> => mkN012 form1;
+		<_ + "ла", _ + "л"> => mkN012 form1;
+		<_ + "па", _ + "п"> => mkN012 form1;
+		<_ + "ап", _ + "ы"> => mkN031 form1;
+		<_ + "эл", _ + "ў"> => mkN013 form1;
+		<_ + "ен", _ + "ы"> => mkN045 form1;
+		<_ + "ей", _ + "ў"> => mkN022 form1;
+		<_ + "ёл", _ + "ы"> => mkN031 form1;
+		<_ + "та", _ + "ў"> => mkN078 form1;
+		<_ + "ін", _ + "ы"> => mkN031 form1;
+		<_ + "ст", _ + "ы"> => mkN032 form1;
+		<_ + "шч", _ + "ў"> => mkN346 form1;
+		<_ + "ца", _ + "ц"> => mkN137 form1;
+		<_ + "рд", _ + "ў"> => mkN081 form1;
+		<_ + "ск", _ + "ў"> => mkN063 form1;
+		<_ + "еч", _ + "ы"> => mkN069 form1;
+		<_ + "ча", _ + "ў"> => mkN141 form1;
+		<_ + "бя", _ + "т"> => mkN153 form1;
+		<_ + "ль", _ + "ў"> => mkN152 form1;
+		<_ + "нь", _ + "ў"> => mkN152 form1;
+		<_ + "ха", _ + "і"> => mkN309 form1;
+		<_ + "зь", _ + "ў"> => mkN132 form1;
+		<_ + "оя", _ + "і"> => mkN301 form1;
+		<_ + "ж", _ + "ыжы"> => mkN090 form1;
+		<_ + "г", _ + "ўгі"> => mkN044 form1;
+		<_ + "с", _ + "ысы"> => mkN050 form1;
+		<_ + "д", _ + "оды"> => mkN037 form1;
+		<_ + "р", _ + "ары"> => mkN059 form1;
+		<_ + "ь", _ + "кці"> => mkN177 form1;
+		<_ + "ь", _ + "гці"> => mkN177 form1;
+		<_ + "ь", _ + "аці"> => mkN325 form1;
+		<_ + "т", _ + "оў"> => mkN001 form1;
+		<_ + "к", _ + "оў"> => mkN006 form1;
+		<_ + "л", _ + "оў"> => mkN159 form1;
+		<_ + "й", _ + "оі"> => mkN017 form1;
+		<_ + "й", _ + "іі"> => mkN067 form1;
+		<_ + "с", _ + "оў"> => mkN195 form1;
+		<_ + "н", _ + "оў"> => mkN038 form1;
+		<_ + "о", _ + "вы"> => mkN278 form1;
+		<_ + "т", _ + "ў"> => mkN131 form1;
+		<_ + "а", _ + "к"> => mkN003 form1;
+		<_ + "к", _ + "ў"> => mkN063 form1;
+		<_ + "м", _ + "ў"> => mkN013 form1;
+		<_ + "л", _ + "ў"> => mkN013 form1;
+		<_ + "с", _ + "ў"> => mkN013 form1;
+		<_ + "з", _ + "ў"> => mkN013 form1;
+		<_ + "н", _ + "ў"> => mkN013 form1;
+		<_ + "п", _ + "ў"> => mkN029 form1;
+		<_ + "р", _ + "ў"> => mkN062 form1;
+		<_ + "х", _ + "ў"> => mkN063 form1;
+		<_ + "я", _ + "т"> => mkN153 form1;
+		<_ + "я", _ + "ў"> => mkN154 form1;
+		<_ + "я", _ + "ь"> => mkN232 form1;
+		<_ + "я", _ + "й"> => mkN384 form1;
+		<_ + "ц", _ + "ы"> => mkN299 form1;
+		<_ + "ь", _ + "й"> => mkN323 form1;
+		_ => regN form1
+  } ;
+
+  regV : Str -> V   -- infinitive
+    = \form -> case form of {
+		_ + "агчы" => mkV021 form;
+		_ + "іць" => mkV036 form;
+		_ + "эць" => mkV048 form;
+		_ + "ыць" => mkV020 form;
+		_ + "уць" => mkV045 form;
+		_ + "ячы" => mkV072 form;
+		_ + "ьці" => mkV013 form;
+		_ + "зці" => mkV049 form;
+		_ + "бці" => mkV137 form;
+        _ + "сці" => mkV016 form;
+        _ + "цца" => mkV043 form;
+		_ + "ма" => mkV013 form;
+		_ + "шы" => mkV013 form;
+		_ + "ь" => mkV015 form;
+		_ => error "Cannot find an inflection rule"
+  } ;
+
+  reg2V : Str -> Str -> V   -- infinitive  Imperative;Sg
+    = \form1, form2 -> case <form1, form2> of {
+		<_ + "іць", _ + "ані"> => mkV096 form1;
+		<_ + "іць", _ + "яні"> => mkV079 form1;
+		<_ + "іць", _ + "апі"> => mkV017 form1;
+		<_ + "іць", _ + "сці"> => mkV078 form1;
+		<_ + "уць", _ + "кні"> => mkV074 form1;
+		<_ + "уць", _ + "хні"> => mkV074 form1;
+		<_ + "іць", _ + "ві"> => mkV001 form1;
+		<_ + "іць", _ + "бі"> => mkV058 form1;
+		<_ + "іць", _ + "зі"> => mkV058 form1;
+		<_ + "іць", _ + "аі"> => mkV155 form1;
+		<_ + "іць", _ + "пі"> => mkV058 form1;
+		<_ + "іць", _ + "ці"> => mkV033 form1;
+		<_ + "іць", _ + "сі"> => mkV050 form1;
+		<_ + "іць", _ + "ць"> => mkV060 form1;
+		<_ + "іць", _ + "мь"> => mkV106 form1;
+		<_ + "ыць", _ + "жы"> => mkV064 form1;
+		<_ + "іць", _ + "і"> => mkV011 form1;
+		<_ + "іць", _ + "ў"> => mkV139 form1;
+		<_ + "іць", _ + "й"> => mkV156 form1;
+		<_ + "эць", _ + "й"> => mkV015 form1;
+		<_ + "эць", _ + "ь"> => mkV063 form1;
+		<_ + "ыць", _ + "ы"> => mkV070 form1;
+		<_ + "ыць", _ + "й"> => mkV055 form1;
+		<_ + "ыць", _ + "і"> => mkV089 form1;
+		<_ + "уць", _ + "ь"> => mkV037 form1;
+		<_ + "уць", _ + "й"> => mkV055 form1;
+		<_ + "зці", _ + "ь"> => mkV092 form1;
+		<_ + "ь", _ + "жуй"> => mkV003 form1;
+		<_ + "ь", _ + "цай"> => mkV055 form1;
+		<_ + "ь", _ + "лжы"> => mkV125 form1;
+		<_ + "ь", _ + "аві"> => mkV102 form1;
+		<_ + "ь", _ + "ссі"> => mkV145 form1;
+		<_ + "і", _ + "асі"> => mkV137 form1;
+		<_ + "ы", _ + "яжы"> => mkV143 form1;
+		<_ + "а", _ + "іся"> => mkV046 form1;
+		<_ + "а", _ + "ыся"> => mkV046 form1;
+		<_ + "а", _ + "ься"> => mkV080 form1;
+		<_ + "а", _ + "рся"> => mkV087 form1;
+		<_ + "а", _ + "чся"> => mkV087 form1;
+		<_ + "ь", _ + "уй"> => mkV029 form1;
+		<_ + "ь", _ + "ой"> => mkV025 form1;
+		<_ + "ь", _ + "юй"> => mkV120 form1;
+		<_ + "ь", _ + "нь"> => mkV063 form1;
+		<_ + "ь", _ + "шы"> => mkV028 form1;
+		<_ + "ь", _ + "чы"> => mkV130 form1;
+		<_ + "ь", _ + "мі"> => mkV039 form1;
+		<_ + "ь", _ + "ві"> => mkV039 form1;
+		<_ + "ь", _ + "зі"> => mkV115 form1;
+		<_ + "ь", _ + "ні"> => mkV102 form1;
+		<_ + "ь", _ + "бі"> => mkV145 form1;
+		<_ + "і", _ + "сі"> => mkV049 form1;
+		<_ + "і", _ + "ці"> => mkV056 form1;
+		<_ + "ь", _ + "ь"> => mkV018 form1;
+		<_ + "ь", _ + "ы"> => mkV066 form1;
+		<_ + "ь", _ + "ч"> => mkV034 form1;
+		<_ + "ь", _ + "і"> => mkV069 form1;
+		<_ + "і", _ + "ь"> => mkV054 form1;
+		_ => regV form1
+  } ;
+
+  regA : Str -> A   -- s;Nom;('GSg', Masc)
+    = \form -> case form of {
+		_ + "які" => mkA006 form;
+		_ + "пы" => mkA002 form;
+		_ + "гі" => mkA006 form;
+		_ + "хі" => mkA006 form;
+		_ + "ні" => mkA005 form;
+		_ + "ці" => mkA005 form;
+		_ + "ыі" => mkA005 form;
+		_ + "ы" => mkA001 form;
+		_ + "і" => mkA003 form;
+		_ + "а" => mkA004 form;
+		_ + "н" => mkA004 form;
+		_ + "т" => mkA004 form;
+		_ + "ў" => mkA004 form;
+		_ + "ь" => mkA004 form;
+		_ => error "Cannot find an inflection rule"
+  } ;
+
+  reg2A : Str -> Str -> A   -- s;Nom;('GSg', Masc)  s;Nom;('GSg', Neuter)
+    = \form1, form2 -> case <form1, form2> of {
+		<_ + "гі", _ + "ае"> => mkA003 form1;
+		<_ + "хі", _ + "ае"> => mkA003 form1;
+		<_ + "ы", _ + "ое"> => mkA002 form1;
+		<_ + "і", _ + "яе"> => mkA004 form1;
+		<_ + "і", _ + "ое"> => mkA006 form1;
+		_ => regA form1
+  } ;
+
+  mkN = overload {
+    mkN : Str -> N = regN;   -- s;Nom;Sg
+    mkN : Str -> Str -> N = reg2N   -- s;Nom;Sg  s;Acc;Pl
+  } ;
+
+  mkN2 = overload {
+     mkN2 : N -> N2 = \n -> lin N2 (n ** {c2 = noPrep}) ;
+     mkN2 : N -> Prep -> N2 = \n,p -> lin N2 (n ** {c2 = p}) ;
+  } ;
+
+  mkN3 = overload {
+     mkN3 : N -> N3 = \n -> lin N3 (n ** {c2 = noPrep; c3 = noPrep}) ;
+     mkN3 : N -> Prep -> Prep -> N3 = \n,p1,p2 -> lin N3 (n ** {c2 = p1; c3 = p2}) ;
+  } ;
+
+  mkV = overload {
+    mkV : Str -> V = regV;   -- infinitive
+    mkV : Str -> Str -> V = reg2V   -- infinitive  Imperative;Sg
+  } ;
+
+  mkVV : V -> VV = \v -> lin VV v ;
+  mkVS : V -> VS = \v -> lin VS v ;
+  mkVQ : V -> VQ = \v -> lin VQ v ;
+  mkVA : V -> VA = \v -> lin VA v ;
+
+  mkV2 = overload {
+     mkV2 : V -> V2 = \v -> lin V2 (v ** {c2 = noPrep}) ;
+     mkV2 : V -> Prep -> V2 = \v,p -> lin V2 (v ** {c2 = p}) ;
+  } ;
+
+  mkV3 = overload {
+     mkV3 : V -> V3 = \v -> lin V3 (v ** {c2 = noPrep; c3 = noPrep}) ;
+     mkV3 : V -> Prep -> Prep -> V3 = \v,p1,p2 -> lin V3 (v ** {c2 = p1; c3 = p2}) ;
+  } ;
+
+  mkV2A = overload {
+     mkV2A : V -> V2A = \v -> lin V2A (v ** {c2 = noPrep; c3 = noPrep}) ;
+     mkV2A : V -> Prep -> Prep -> V2A = \v,p1,p2 -> lin V2A (v ** {c2 = p1; c3 = p2}) ;
+  } ;
+
+  mkV2S = overload {
+     mkV2S : V -> V2S = \v -> lin V2S (v ** {c2 = noPrep; c3 = noPrep}) ;
+     mkV2S : V -> Prep -> Prep -> V2S = \v,p1,p2 -> lin V2S (v ** {c2 = p1; c3 = p2}) ;
+  } ;
+
+  mkV2Q = overload {
+     mkV2Q : V -> V2Q = \v -> lin V2Q (v ** {c2 = noPrep; c3 = noPrep}) ;
+     mkV2Q : V -> Prep -> Prep -> V2Q = \v,p1,p2 -> lin V2Q (v ** {c2 = p1; c3 = p2}) ;
+  } ;
+
+  mkV2V = overload {
+     mkV2V : V -> V2V = \v -> lin V2V (v ** {c2 = noPrep; c3 = noPrep}) ;
+     mkV2V : V -> Prep -> Prep -> V2V = \v,p1,p2 -> lin V2V (v ** {c2 = p1; c3 = p2}) ;
+  } ;
+
+  mkA = overload {
+    mkA : Str -> A = regA;   -- s;Nom;('GSg', Masc)
+    mkA : Str -> Str -> A = reg2A   -- s;Nom;('GSg', Masc)  s;Nom;('GSg', Neuter)
+  } ;
+
+  mkA2 = overload {
+     mkA2 : A -> A2 = \a -> lin A2 (a ** {c2 = noPrep}) ;
+     mkA2 : A -> Prep -> A2 = \a,p -> lin A2 (a ** {c2 = p}) ;
+  } ;
+
+  mkAdv : Str -> Adv = \s -> lin Adv {s=s} ;
+  mkAdV : Str -> AdV = \s -> lin AdV {s=s} ;
+  mkAdA : Str -> AdA = \s -> lin AdA {s=s} ;
+  mkAdN : Str -> AdN = \s -> lin AdN {s=s} ;
+  mkCAdv : Str -> CAdv = \s -> lin CAdv {s=s; p=""} ;
+  mkInterj : Str -> Interj = \s -> lin Interj {s=s} ;
+  mkMU : Str -> MU = \s -> lin MU {s=s; isPre=False} ;
+
+  mkPrep : Str -> Prep = \s -> lin Prep {s=s; c=Acc} ;
+
+  mkIAdv : Str -> IAdv = \s -> lin IAdv {s=s} ;
+  mkIP : Str -> IP = \s -> lin IP {s=s} ;
+  mkIQuant : Str -> IQuant = \s -> lin IQuant {s=s} ;
+  mkIDet : Str -> IDet = \s -> lin IDet {s=s} ;
+  mkSubj : Str -> Subj = \s -> lin Subj {s=s} ;
+  mkQuant : Str -> Quant = \s -> lin Quant {s=s} ;
+  mkPredet : Str -> Predet = \s -> lin Predet {s=s} ;
+  mkDet : Str -> Det = \s -> lin Det {s=s} ;
+  mkCard : Str -> Card = \s -> lin Card {s=s} ;
+  mkConj : Str -> Conj = \s -> lin Conj {s=s} ;
+  mkPConj : Str -> PConj = \s -> lin PConj {s=s} ;
+  mkVoc : Str -> Voc = \s -> lin Voc {s=s} ;
+
+  mkLN : Str -> LN = \s -> lin LN {s=s} ;
+  mkGN : Str -> GN = \s -> lin GN {s=s} ;
+  mkSN : Str -> SN = \s -> lin SN {s=s} ;
+  mkPN : Str -> PN = \s -> lin PN {s=s} ;
+
+}

src/belarusian/PhraseBel.gf

@@ -0,0 +1,11 @@
+concrete PhraseBel of Phrase = CatBel ** {
+lin
+  PhrUtt pconj utt voc = {s = pconj.s ++ utt.s ++ voc.s} ;
+
+  UttS s = s ;
+  UttInterj i = i ;
+
+  NoPConj = {s = []} ;
+
+  NoVoc = {s = []} ;
+}

src/belarusian/ResBel.gf

@@ -0,0 +1,163 @@
+resource ResBel = {
+
+param Case = Nom | Acc | Dat | Gen | Loc | Instr ;
+param Number = Sg | Pl ;
+param Gender = Masc | Fem | Neuter ;
+oper Noun = {s: Case => Number => Str; voc: Str; g: Gender} ; -- 2696
+oper mkNoun : (_,_,_,_,_,_,_,_,_,_,_,_,_ : Str) -> Gender -> Noun =
+       \f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13,g ->
+          { s = table {
+                  Nom => table {
+                           Sg => f1 ;
+                           Pl => f2
+                         } ;
+                  Acc => table {
+                           Sg => f3 ;
+                           Pl => f4
+                         } ;
+                  Dat => table {
+                           Sg => f5 ;
+                           Pl => f6
+                         } ;
+                  Gen => table {
+                           Sg => f7 ;
+                           Pl => f8
+                         } ;
+                  Loc => table {
+                           Sg => f9 ;
+                           Pl => f10
+                         } ;
+                  Instr => table {
+                             Sg => f11 ;
+                             Pl => f12
+                           }
+                } ;
+            voc = f13 ;
+            g = g
+          } ;
+
+
+param Aspect = Imperf | Perf ;
+param Person = P1 | P2 | P3 ;
+param Tense = Pres | Past ;
+oper V = {active: Aspect => {Past: Str; Pres: Person => Number => Str}; imperative: Number => Str; infinitive: Str; participle: Gender => Number => Str; passive: Aspect => Tense => Str} ; -- 703
+oper mkV : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ : Str) -> V =
+       \f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13,f14,f15,f16,f17,f18,f19,f20,f21,f22,f23,f24,f25,f26,f27 ->
+          { active = table {
+                       Imperf => { Past = f1 ;
+                                   Pres = table {
+                                            P1 => table {
+                                                    Sg => f2 ;
+                                                    Pl => f3
+                                                  } ;
+                                            P2 => table {
+                                                    Sg => f4 ;
+                                                    Pl => f5
+                                                  } ;
+                                            P3 => table {
+                                                    Sg => f6 ;
+                                                    Pl => f7
+                                                  }
+                                          }
+                                 } ;
+                       Perf => { Past = f8 ;
+                                 Pres = table {
+                                          P1 => table {
+                                                  Sg => f9 ;
+                                                  Pl => f10
+                                                } ;
+                                          P2 => table {
+                                                  Sg => f11 ;
+                                                  Pl => f12
+                                                } ;
+                                          P3 => table {
+                                                  Sg => f13 ;
+                                                  Pl => f14
+                                                }
+                                        }
+                               }
+                     } ;
+            imperative = table {
+                           Sg => f15 ;
+                           Pl => f16
+                         } ;
+            infinitive = f17 ;
+            participle = table {
+                           Masc => table {
+                                     Sg => f18 ;
+                                     Pl => f19
+                                   } ;
+                           Fem => table {
+                                    Sg => f20 ;
+                                    Pl => f21
+                                  } ;
+                           Neuter => table {
+                                       Sg => f22 ;
+                                       Pl => f23
+                                     }
+                         } ;
+            passive = table {
+                        Imperf => table {
+                                    Pres => f24 ;
+                                    Past => f25
+                                  } ;
+                        Perf => table {
+                                  Pres => f26 ;
+                                  Past => f27
+                                }
+                      }
+          } ;
+
+
+param GenNum = GSg Gender | GPl ;
+oper A = {s: Case => GenNum => Str} ; -- 704
+oper mkA : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ : Str) -> A =
+       \f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13,f14,f15,f16,f17,f18,f19,f20,f21,f22,f23,f24 ->
+          { s = table {
+                  Nom => table {
+                           GSg Masc => f1 ;
+                           GSg Fem => f2 ;
+                           GSg Neuter => f3 ;
+                           GPl => f4
+                         } ;
+                  Acc => table {
+                           GSg Masc => f5 ;
+                           GSg Fem => f6 ;
+                           GSg Neuter => f7 ;
+                           GPl => f8
+                         } ;
+                  Dat => table {
+                           GSg Masc => f9 ;
+                           GSg Fem => f10 ;
+                           GSg Neuter => f11 ;
+                           GPl => f12
+                         } ;
+                  Gen => table {
+                           GSg Masc => f13 ;
+                           GSg Fem => f14 ;
+                           GSg Neuter => f15 ;
+                           GPl => f16
+                         } ;
+                  Loc => table {
+                           GSg Masc => f17 ;
+                           GSg Fem => f18 ;
+                           GSg Neuter => f19 ;
+                           GPl => f20
+                         } ;
+                  Instr => table {
+                             GSg Masc => f21 ;
+                             GSg Fem => f22 ;
+                             GSg Neuter => f23 ;
+                             GPl => f24
+                           }
+                }
+          } ;
+
+
+oper Compl = {s : Str; c : Case} ;
+oper noPrep : Compl = {s=""; c=Acc} ;
+
+oper CommonNoun = Noun ;
+oper AdjPhrase = A ;
+
+}

src/bulgarian/CatBul.gf

@@ -1,5 +1,5 @@
 --# -coding=utf8
-concrete CatBul of Cat = CommonX - [Temp,Tense,IAdv,AdV] ** open ResBul, Prelude, Predef, (R = ParamX) in {
+concrete CatBul of Cat = CommonX - [Temp,Tense,TTAnt,IAdv,AdV] ** open ResBul, Prelude, Predef, (R = ParamX) in {
 
   lincat
 -- Tensed/Untensed

src/bulgarian/ConjunctionBul.gf

@@ -32,7 +32,6 @@ concrete ConjunctionBul of Conjunction =
 
     ConjAP conj ss = {
       s     = \\aform,p => linCoord []!conj.sep ++ ss.s!aform!p!conj.sep ++ conj.s ++ ss.s!aform!p!4;
-      adv   =              ss.adv!conj.conj ++ conj.s ++ ss.adv!4;
       isPre = ss.isPre
       } ;
 

src/bulgarian/DocumentationBul.gf

@@ -148,7 +148,7 @@ lin
     s1= heading1 ("Прилагателно") ;
     s2= frameTable (
           tr (intagAttr "th" "rowspan=\"7\"" "ед.ч." ++ 
-              intagAttr "th" "rowspan=\"3\"" "мн.ч." ++ 
+              intagAttr "th" "rowspan=\"3\"" "м.р." ++
               th "нечленувано" ++ 
               td (a.s ! (ASg Masc Indef))) ++
           tr (th "непълен член" ++ td (a.s ! (ASg Masc Def))) ++

src/bulgarian/ExtendBul.gf

@@ -316,18 +316,6 @@ lin UseComp_estar = UseComp ;
 
 lin ProDrop pro = pro ;
 
-lin AnaphPron np =
-      case <np.gn, np.p> of {
-        <GSg _, PronP1> => i_Pron ;
-        <GSg _, PronP2> => youSg_Pron ;
-        <GSg Masc,   _> => he_Pron ;
-        <GSg Fem,    _> => she_Pron ;
-        <GSg Neutr,  _> => it_Pron ;
-        <GPl,   PronP1> => we_Pron ;
-        <GPl,   PronP2> => youPl_Pron ;
-        <GPl,        _> => they_Pron
-      } ;
-
 lin TPastSimple = {s = []} ** {t = VPastSimple} ;  --# notpresent
 
 }

src/bulgarian/LangBul.gf

@@ -1,4 +1,4 @@
---# -path=.:../abstract:../common:../api
+--# -path=.:../abstract:../common:../api:../prelude
 
 concrete LangBul of Lang = 
   GrammarBul,

src/bulgarian/MorphoFunsBul.gf

@@ -33,13 +33,13 @@ oper
   mkA2 a p = a ** {c2 = p ; lock_A2 = <>} ;
   
   mkAS  : A -> AS ;
-  mkAS  v = v ** {lock_A = <>} ;
+  mkAS  v = v ;
   
   mkA2S : A -> Prep -> A2S ;
-  mkA2S v p = mkA2 v p ** {lock_A = <>} ;
+  mkA2S v p = mkA2 v p ;
   
   mkAV  : A -> AV ;
-  mkAV  v = v ** {lock_A = <>} ;
+  mkAV  v = v ;
   
   mkA2V : A -> Prep -> A2V ;
   mkA2V v p = mkA2 v p ** {lock_A2 = <>} ;
@@ -75,7 +75,6 @@ oper
   compoundV : V -> Str -> V ;
   compoundV v adv = {
     s = \\asp,vform => v.s ! asp ! vform ++ adv ;
-    n = \\nform => v.n ! nform ++ adv ;
     vtype = VNormal;
     lock_V=<>
     } ;
@@ -105,7 +104,7 @@ oper
 -- the first one or both can be absent.
 
   mkV3     : V -> Prep -> Prep -> V3 ;   -- speak, with, about
-  mkV3 v p q = {s = v.s; s1 = v.s1; c2 = p; c3 = q; vtype = v.vtype; lock_V3 = <>} ;
+  mkV3 v p q = {s = v.s; c2 = p; c3 = q; vtype = v.vtype; lock_V3 = <>} ;
   
   dirV3    : V -> Prep -> V3 ;           -- give,_,to
   dirV3 v p = mkV3 v noPrep p ;
@@ -169,7 +168,7 @@ oper
 --
 
   prepN2 : N -> Prep -> N2 ;
-  prepN2 n p = n ** {c2 = p} ;
+  prepN2 n p = lin N2 (n ** {c2 = p}) ;
   
   dirN2 : N -> N2 ;
   dirN2 n = prepN2 n noPrep ;
@@ -179,7 +178,7 @@ oper
 --
 
   prepN3 : N -> Prep -> Prep -> N3 ;
-  prepN3 n p q = n ** {c2 = p; c3 = q} ;
+  prepN3 n p q = lin N3 (n ** {c2 = p; c3 = q}) ;
   
   dirN3 : N -> Prep -> N3 ;
   dirN3 n p = prepN3 n noPrep p ;
@@ -189,9 +188,9 @@ oper
 
   compoundN = overload {
     compoundN : Str -> N -> N 
-      = \s,n -> {s = \\nform => s ++ n.s ! nform ; rel = \\aform => s ++ n.rel ! aform; relType = AdvMod; g=n.g ; anim=n.anim ; lock_N = <>} ;
+      = \s,n -> {s = \\nform => s ++ n.s ! nform ; rel = \\aform => s ++ n.rel ! aform; relType = AdvMod; g=n.g ; lock_N = <>} ;
     compoundN : N -> Str -> N 
-      = \n,s -> {s = \\nform => n.s ! nform ++ s; rel = \\aform => n.rel ! aform ++ s; relType = AdvMod; g=n.g ; anim=n.anim ; lock_N = <>} ;
+      = \n,s -> {s = \\nform => n.s ! nform ++ s; rel = \\aform => n.rel ! aform ++ s; relType = AdvMod; g=n.g ; lock_N = <>} ;
     compoundN : N -> N -> N 
       = \n1,n2 -> lin N
                 {s = table {

src/bulgarian/NumeralBul.gf

@@ -200,12 +200,6 @@ lin pot5decimal d = {
       _  => BIND
       } ;
 
-    inc : DTail -> DTail = \t -> case t of {
-      T1 => T2 ;
-      T2 => T3 ;
-      T3 => T1
-      } ;
-
     mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c (c+"ма") o Pl ;
     mkDig : Str -> TDigit = \c -> mk2Dig c (c + "ти") ;
 

src/bulgarian/ParadigmsBul.gf

@@ -187,7 +187,7 @@ oper
                  in {s = mkNoun (v0+"е"+v1)
                                 (v0+v1+"и")
                                 (v0+"е"+v1+"а")
-                                (v0+"е"+v1+"е")
+                                (v0+v1+"ьо")
                                 g ;
                      rel = \\_ => base ; relType = Pref ;
                      g   = g ;

src/bulgarian/SentenceBul.gf

@@ -70,8 +70,7 @@ concrete SentenceBul of Sentence = CatBul ** open Prelude, ResBul in {
       s = \\q => t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.p ! q
     } ;
     UseRCl t p cl = {
-      s    = \\agr => t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.p ! agr ;
-      role = cl.role
+      s    = \\agr => t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.p ! agr
     } ;
     UseSlash t p cl = {
       s = \\agr => t.s ++ p.s ++ cl.s ! agr ! t.t ! t.a ! p.p ! Main ;

src/bulgarian/TenseBul.gf

@@ -1,6 +1,7 @@
-concrete TenseBul of Tense = CatBul [Tense,Temp], TenseX - [Temp,Tense,TPres,TPast,TFut,TCond,IAdv,AdV,SC] ** open ResBul in {
+concrete TenseBul of Tense = CatBul [Tense,Temp], TenseX - [Temp,Tense,TTAnt,TPres,TPast,TFut,TCond,IAdv,AdV,SC] ** open ResBul in {
 
 lin
+  TTAnt t a = {s = a.s ++ t.s ; a = a.a ; t = t.t} ;
   TPres = {s = []} ** {t = VPresent} ;
   TPast = {s = []} ** {t = VPastImperfect} ;  --# notpresent
   TFut  = {s = []} ** {t = VFut} ;            --# notpresent

src/catalan/ExtendCat.gf

@@ -1,7 +1,9 @@
 --# -path=alltenses:../common:../abstract:../romance
 concrete ExtendCat of Extend = CatCat ** ExtendRomanceFunctor--  -
-  -- [
-  --   ]
+--  [
+      
+
+--     ]
   -- don't forget to put the names of your own
                        -- definitions here
   with
@@ -15,4 +17,6 @@ concrete ExtendCat of Extend = CatCat ** ExtendRomanceFunctor--  -
   ParadigmsCat in {
     -- put your own definitions here
 
+
+
 } ;

src/catalan/NumeralCat.gf

@@ -179,12 +179,6 @@ param
       _  => BIND
       } ;
 
-    inc : DTail -> DTail = \t -> case t of {
-      T1 => T2 ;
-      T2 => T3 ;
-      T3 => T1
-      } ;
-
   oper
     mk2Dig : Str -> Str -> TDigit = \c,o -> mk3Dig c o Pl ;
     mkDig : Str -> TDigit = \c -> mk2Dig c (c + ":o") ;

src/catalan/ParadigmsCat.gf

@@ -42,14 +42,14 @@ flags
 -- To abstract over gender names, we define the following identifiers.
 
 oper
-  Gender : Type ;
+  Gender : PType ;
 
   masculine : Gender ;
   feminine  : Gender ;
 
 -- To abstract over number names, we define the following.
 
-  Number : Type ;
+  Number : PType ;
 
   singular : Number ;
   plural   : Number ;

src/chinese/ParadigmsChi.gf

@@ -155,6 +155,8 @@ oper
       = \s,at -> lin Adv {s = word s ; advType = at ; hasDe = advTypeHasDe at} ;
     mkAdv : Adv -> AdvType -> Adv -- To fix the AdvType in an Adv produced by SyntaxChi.mkAdv
       = \adv,at -> adv ** {advType = at ; hasDe = advTypeHasDe at} ;
+    mkAdv : Str -> AdvType -> Bool -> Adv
+      = \s,at,hasDe -> lin Adv {s = word s ; advType = at ; hasDe = hasDe} ;
 
     } ;
 
@@ -181,7 +183,7 @@ oper
   mkInterj : Str -> Interj
     = \s -> lin Interj {s = word s} ;
 
-  emptyPrep : Preposition = mkPrep [] ;
+  emptyPrep : Prep = mkPrep [] ;
 
   mkpNP : Str -> CatChi.NP
     = \s -> lin NP {s = word s ; det = []} ;