Merge branch 'master' of github.com:GrammaticalFramework/gf-rgl

* (Ger) prepositions of contracting type, to base S,VV,QS-correlates and split adverbs on

* api/TryGer: omit mkAdv,mkIAdv,mkConj from ParadigmsGer, mkStructuralGer

* (Ger) sync with 'master' (undo changes unrelated to Preposition) up to few corrections

* (Ger) correct GPl to CPl in ExtraGer

* Returning to f4aae6a61a by ignoring prep-contraction

* (Ger) Prep contracting with DefArtSg, IP, RP

* (Ger) Corrected GPl to CPl in ExtraGer, ExtendGer

* (Ger) Simplified many lincats (Prep,V2,N2,A2,.. VPSlash,ClSlash) by reducing
      Preposition from 4*3 = 12 parameters to 3*2 = 6 via
         Prepositon : Type = {s : PrepForm => Str; s2:Str ; c : ObjCase ; t : PrepType} ;
         param PrepType = isCase | isPrep ; -- isPrepDefArt
               ObjCase = Acc | Dat | Gen ;   Case = Nom | Obj ObjCase ;

.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
@@ -366,8 +378,8 @@ gfcn :: Info -> Mode -> String -> [FilePath] -> IO ()
 gfcn bi mode summary files = do
   let dir = getRGLBuildDir bi mode
       preproc = case mode of
-                  Present   -> "--preproc=mkPresent"
-                  AllTenses -> ""
+                  Present -> "--preproc=mkPresent"
+                  _       -> ""
   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,,,,,,y,,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,y,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/Documentation.gf

@@ -35,6 +35,7 @@ fun
   InflectionAdA : AdA -> Inflection ;
   InflectionAdN : AdN -> Inflection ;
   InflectionPrep : Prep -> Inflection ;
+  InflectionCl : Cl -> Inflection ;
 
 fun
   NoDefinition   : String -> Definition ;

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,26 @@
+concrete AdjectiveSqi of Adjective = CatSqi ** open ResSqi, Prelude in {
+
+  oper
+    adjForm : A -> Species => Case => Gender => Number => Str = \a -> \\sp,c,g,n =>
+      case a.clit of {
+        True  => link_clitic ! sp ! c ! g ! n ++ a.s ! c ! g ! n ;
+        False => a.s ! c ! g ! n
+      } ;
+
+  lin
+    PositA  a = {
+      s = adjForm a
+    } ;
+
+    ComparA a np = {s=\\sp,c,g,n=>"më" ++ adjForm a ! sp ! c ! g ! n ++ "se" ++ np.s ! Ablat} ;
+    UseComparA a = {s=\\sp,c,g,n=>"më" ++ adjForm a ! sp ! c ! g ! n} ;
+    ComplA2 a np = {s=\\sp,c,g,n=>adjForm (lin A a) ! sp ! c ! g ! n ++ a.c2.s ++ np.s ! a.c2.c} ;
+    UseA2 a = PositA a ;
+    ReflA2 a = {s=\\sp,c,g,n=>adjForm (lin A a) ! sp ! c ! g ! n ++ a.c2.s ++ "vetveten"} ;
+    CAdvAP cadv ap np = {s=\\sp,c,g,n=>cadv.s ++ ap.s ! sp ! c ! g ! n ++ cadv.p ++ np.s ! Ablat} ;
+    AdjOrd ord = {s=\\_,c,g,n=>ord.s ! c ! g ! n} ;
+    SentAP ap sc = {s=\\sp,c,g,n=>ap.s ! sp ! c ! g ! n ++ "që" ++ sc.s} ;
+    AdAP ada ap = {s=\\sp,c,g,n=>ada.s ++ ap.s ! sp ! c ! g ! n} ;
+    AdvAP ap adv = {s=\\sp,c,g,n=>ap.s ! sp ! c ! g ! n ++ adv.s} ;
+
+}

src/albanian/AdverbSqi.gf

@@ -0,0 +1,11 @@
+concrete AdverbSqi of Adverb = CatSqi ** open Prelude, ResSqi in {
+lin
+  PositAdvAdj a = {s=a.s ! Nom ! Masc ! Sg} ;
+  PrepNP p np = {s=p.s ++ np.s ! p.c} ;
+  ComparAdvAdj c a np = {s=c.s ++ a.s ! Nom ! Masc ! Sg ++ c.p ++ np.s ! Ablat} ;
+  ComparAdvAdjS c a s = {s=c.s ++ a.s ! Nom ! Masc ! Sg ++ c.p ++ s.s} ;
+  AdAdv a adv = {s=a.s ++ adv.s} ;
+  PositAdAAdj a = {s=a.s ! Nom ! Masc ! Sg} ;
+  SubjS subj s = {s=subj.s ++ s.s} ;
+  AdnCAdv c = {s=c.s ++ c.p} ;
+}

src/albanian/AllSqi.gf

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

src/albanian/AllSqiAbs.gf

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

src/albanian/CatSqi.gf

@@ -0,0 +1,79 @@
+concrete CatSqi of Cat = CommonX ** open ParamX,Prelude,ResSqi in {
+  lincat A = Adj ;
+  linref A = \a -> case a.clit of {True=>"i"; False=>[]} ++ a.s ! Nom ! Masc ! Sg ;
+  lincat A2 = Adj ** {c2 : Compl} ;
+  linref A2 = \a -> case a.clit of {True=>"i"; False=>[]} ++ a.s ! Nom ! Masc ! Sg ++ a.c2.s ;
+  lincat V, VA, VV, VS, VQ = Verb ;
+  lincat V2 = Verb ** {c2 : Compl} ;
+  lincat V2S, V2Q, V3, V2A, V2V = Verb ** {c2,c3 : Compl} ;
+  lincat Prep = Compl ;
+  lincat ACard = {s : Str} ;
+  lincat AP = {s : Species => Case => Gender => Number => Str} ;
+  lincat CN = Noun ;
+  lincat Card = {s : Str} ;
+  lincat Cl = {s : ParamX.Tense => Anteriority => Polarity => Str} ;
+  lincat ClSlash = {s : ParamX.Tense => Anteriority => Polarity => Str; c2 : Compl} ;
+  lincat Comp = {s : Agr => Str} ;
+  lincat Conj = {s : Str} ;
+  lincat DAP = {s : Str; n : Number} ;
+  lincat Decimal = {s : Str; n : Number; hasDot : Bool} ;
+  lincat Det = {
+    s : Case => Gender => Str;
+    post : Species => Case => Gender => Str;
+    sp : Species;
+    n : Number
+    } ;
+  lincat Digits = {s : Str; n : Number; tail : DTail} ;
+  lincat GN = {s : Str} ;
+  lincat IComp = {s : Str} ;
+  lincat IDet = {s : Gender => Str; n : Number} ;
+  lincat IP = {s : Str; a : Agr} ;
+  lincat IQuant = {s : Gender => Str} ;
+  lincat Imp = {s : Polarity => Number => Str} ;
+  lincat LN = {s : Str} ;
+  lincat N = Noun ;
+  lincat N2 = {s : Species => Case => Number => Str; g : Gender;
+               c2 : Compl} ;
+  lincat N3 = {s : Species => Case => Number => Str; g : Gender;
+               c2 : Compl; c3 : Compl} ;
+  lincat NP = {s : Case => Str; a : Agr} ;
+  lincat Num = {s : Str; n : Number} ;
+  lincat Numeral = {s : Str} ;
+  lincat Ord = {s : Case => Gender => Number => Str} ;
+  lincat PN = {s : Str} ;
+  lincat Predet = {s : Str} ;
+  lincat Pron = {s: Case => Str; acc_clit, dat_clit : Str; a : Agr} ;
+  lincat QCl = {s : ParamX.Tense => Anteriority => Polarity => Str} ;
+  lincat QS = {s : Str} ;
+  lincat Quant = {
+    s : Case => Gender => Number => Str;
+    sp : Species;
+    isPoss : Bool
+    } ;
+  lincat RCl = {s : Agr => ParamX.Tense => Anteriority => Polarity => Str} ;
+  lincat RP = {s : Case => GenNum => Str} ;
+  lincat RS = {s : Agr => Str} ;
+  lincat S = {s : Str} ;
+  lincat SN = {s : Str} ;
+  lincat SSlash = {s : Str; c2 : Compl} ;
+  lincat Subj = {s : Str} ;
+  lincat VP = {indicative : Tense => Number => Person => Gender => Case => Str;
+               subjunctive : Number => Person => Gender => Case => Str;
+               imperative : Number => Case => Str;
+               participle : Agr => Case => Str;
+               pres_optative : Number => Person => Case => Str;
+               perf_optative : Number => Person => Case => Str;
+               pres_admirative : Number => Person => Case => Str;
+               imperf_admirative : Number => Person => Case => Str;
+               vtype : VType} ;
+
+  lincat VPSlash = {indicative : Tense => Number => Person => Str;
+                    subjunctive : 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;
+                    vtype : VType;
+                    c2 : Compl} ;
+}

src/albanian/ConjunctionSqi.gf

@@ -0,0 +1,27 @@
+concrete ConjunctionSqi of Conjunction = CatSqi ** open ResSqi, Prelude, ParamX in {
+lincat
+  [S] = {first,last : Str} ;
+  [RS] = {first,last : Agr => Str} ;
+  [Adv] = {first,last : Str} ;
+  [AdV] = {first,last : Str} ;
+  [IAdv] = {first,last : Str} ;
+  [NP] = {first,last : Case => Str; a : Agr} ;
+  [AP] = {first,last : Species=>Case=>Gender=>Number=>Str} ;
+  [CN] = {first,last : Species=>Case=>Number=>Str; g:Gender} ;
+  [DAP] = {first,last : Str; n:Number} ;
+lin
+  BaseS x y={first=x.s;last=y.s}; ConsS x xs={first=x.s++","++xs.first;last=xs.last}; ConjS c xs={s=xs.first++c.s++xs.last};
+  BaseAdv x y={first=x.s;last=y.s}; ConsAdv x xs={first=x.s++","++xs.first;last=xs.last}; ConjAdv c xs={s=xs.first++c.s++xs.last};
+  BaseAdV x y={first=x.s;last=y.s}; ConsAdV x xs={first=x.s++","++xs.first;last=xs.last}; ConjAdV c xs={s=xs.first++c.s++xs.last};
+  BaseIAdv x y={first=x.s;last=y.s}; ConsIAdv x xs={first=x.s++","++xs.first;last=xs.last}; ConjIAdv c xs={s=xs.first++c.s++xs.last};
+  BaseNP x y={first=x.s;last=y.s;a={gn=GPl;p=P3}};
+  ConsNP x xs={first=\\k=>x.s!k++","++xs.first!k;last=xs.last;a={gn=GPl;p=P3}};
+  ConjNP c xs={s=\\k=>xs.first!k++c.s++xs.last!k;a=xs.a};
+  BaseAP x y={first=x.s;last=y.s}; ConsAP x xs={first=\\sp,k,g,n=>x.s!sp!k!g!n++","++xs.first!sp!k!g!n;last=xs.last};
+  ConjAP c xs={s=\\sp,k,g,n=>xs.first!sp!k!g!n++c.s++xs.last!sp!k!g!n};
+  BaseRS x y={first=x.s;last=y.s}; ConsRS x xs={first=\\a=>x.s!a++","++xs.first!a;last=xs.last}; ConjRS c xs={s=\\a=>xs.first!a++c.s++xs.last!a};
+  BaseCN x y={first=x.s;last=y.s;g=x.g}; ConsCN x xs={first=\\sp,k,n=>x.s!sp!k!n++","++xs.first!sp!k!n;last=xs.last;g=xs.g};
+  ConjCN c xs={s=\\sp,k,n=>xs.first!sp!k!n++c.s++xs.last!sp!k!n;g=xs.g};
+  BaseDAP x y={first=x.s;last=y.s;n=Pl}; ConsDAP x xs={first=x.s++","++xs.first;last=xs.last;n=Pl};
+  ConjDet c xs={s=\\_,_=>xs.first++c.s++xs.last;post=\\_,_,_=>[];n=xs.n;sp=Def};
+}

src/albanian/ConstructionSqi.gf

@@ -0,0 +1,64 @@
+concrete ConstructionSqi of Construction = CatSqi **
+  open Prelude, ParamX, ResSqi, ParadigmsSqi, GrammarSqi in {
+
+lincat
+  Timeunit = N ;
+  Hour = {s:Str} ;
+  Weekday = N ;
+  Month = N ;
+  Monthday = {s:Str} ;
+  Year = {s:Str} ;
+  Language = N ;
+
+oper
+  adjVP : A -> VP = \a -> UseComp (CompAP (PositA a)) ;
+  appendVP : VP -> Str -> VP = \v,s -> v ** {
+    indicative=\\t,n,p,g,c=>v.indicative!t!n!p!g!c++s;
+    subjunctive=\\n,p,g,c=>v.subjunctive!n!p!g!c++s;
+    imperative=\\n,c=>v.imperative!n!c++s;
+    participle=\\a,c=>v.participle!a!c++s
+  } ;
+  hour : Str -> Hour = \s -> lin Hour {s=s} ;
+
+lin
+  hungry_VP=adjVP (mkA "uritur"); thirsty_VP=adjVP (mkA "etur");
+  tired_VP=adjVP (mkA "lodhur"); scared_VP=adjVP (mkA "frikësuar");
+  ill_VP=adjVP (mkA "sëmurë"); ready_VP=adjVP (mkA "gatshëm");
+  has_age_VP c=appendVP (UseV (irregV "kam" "ke" "ka" "kemi" "keni" "kanë" "ki" "kini" "pasur")) (c.s++"vjeç");
+  n_units_AP c unit a={s=\\sp,k,g,n=>c.s++unit.s!Indef!Nom!Pl++(PositA a).s!sp!k!g!n};
+  n_units_of_NP c unit np={s=\\_=>c.s++unit.s!Indef!Nom!Pl++"nga"++np.s!Ablat;a={gn=GPl;p=P3}};
+  n_unit_CN c unit cn={s=\\sp,k,n=>c.s++unit.s!Indef!Nom!Sg++cn.s!sp!k!n;g=cn.g};
+  bottle_of_CN np={s=\\sp,k,n=>(mkN "shishe").s!sp!k!n++"me"++np.s!Acc;g=Fem};
+  cup_of_CN np={s=\\sp,k,n=>(mkN "filxhan").s!sp!k!n++"me"++np.s!Acc;g=Masc};
+  glass_of_CN np={s=\\sp,k,n=>(mkN "gotë").s!sp!k!n++"me"++np.s!Acc;g=Fem};
+
+  timeunitAdv c u={s="për"++c.s++u.s!Indef!Acc!Pl};
+  timeunitRange a b u={s="nga"++a.s++"deri në"++b.s++u.s!Indef!Acc!Pl};
+  oneHour=hour "1"; twoHour=hour "2"; threeHour=hour "3"; fourHour=hour "4";
+  fiveHour=hour "5"; sixHour=hour "6"; sevenHour=hour "7"; eightHour=hour "8";
+  nineHour=hour "9"; tenHour=hour "10"; elevenHour=hour "11"; twelveHour=hour "12";
+  thirteenHour=hour "13"; fourteenHour=hour "14"; fifteenHour=hour "15"; sixteenHour=hour "16";
+  seventeenHour=hour "17"; eighteenHour=hour "18"; nineteenHour=hour "19"; twentyHour=hour "20";
+  twentyOneHour=hour "21"; twentyTwoHour=hour "22"; twentyThreeHour=hour "23"; twentyFourHour=hour "24";
+  timeHour h={s="në orën"++h.s}; timeHourMinute h m={s="në orën"++h.s++SOFT_BIND++":"++SOFT_BIND++m.s};
+
+  weekdayPunctualAdv w={s="të"++w.s!Def!Acc!Sg};
+  weekdayHabitualAdv w={s="të"++w.s!Def!Acc!Pl};
+  weekdayLastAdv w={s="të"++w.s!Def!Acc!Sg++"e kaluar"};
+  weekdayNextAdv w={s="të"++w.s!Def!Acc!Sg++"e ardhshme"};
+  monthAdv m={s="në"++m.s!Indef!Acc!Sg}; yearAdv y={s="në"++y.s};
+  dayMonthAdv d m={s="më"++d.s++m.s!Indef!Acc!Sg};
+  monthYearAdv m y={s="në"++m.s!Indef!Acc!Sg++y.s};
+  dayMonthYearAdv d m y={s="më"++d.s++m.s!Indef!Acc!Sg++y.s};
+  intYear i={s=i.s}; intMonthday i={s=i.s};
+  weekdayN w=w; monthN m=m;
+  weekdayPN w=mkPN (w.s!Indef!Nom!Sg); monthPN m=mkPN (m.s!Indef!Nom!Sg);
+
+  second_Timeunit=mkN "sekondë"; minute_Timeunit=mkN "minutë"; hour_Timeunit=mkN "orë";
+  day_Timeunit=mkN "ditë"; week_Timeunit=mkN "javë"; month_Timeunit=mkN "muaj"; year_Timeunit=mkN "vit";
+  monday_Weekday=mkN "e hënë"; tuesday_Weekday=mkN "e martë"; wednesday_Weekday=mkN "e mërkurë";
+  thursday_Weekday=mkN "e enjte"; friday_Weekday=mkN "e premte"; saturday_Weekday=mkN "e shtunë"; sunday_Weekday=mkN "e diel";
+  january_Month=mkN "janar"; february_Month=mkN "shkurt"; march_Month=mkN "mars"; april_Month=mkN "prill";
+  may_Month=mkN "maj"; june_Month=mkN "qershor"; july_Month=mkN "korrik"; august_Month=mkN "gusht";
+  september_Month=mkN "shtator"; october_Month=mkN "tetor"; november_Month=mkN "nëntor"; december_Month=mkN "dhjetor";
+}

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/ExtendSqi.gf

@@ -0,0 +1,135 @@
+concrete ExtendSqi of Extend = CatSqi **
+  open Prelude, ParamX, ResSqi, GrammarSqi, (I=IrregSqi) in {
+
+lincat
+  RNP = {s : Agr => Case => Str; isPron : Bool} ;
+  RNPList = {first,last : Agr => Case => Str} ;
+  VPS = {s : Agr => Str} ;
+  VPI = {s : Agr => Str} ;
+  [VPS] = {first,last : Agr => Str} ;
+  [VPI] = {first,last : Agr => Str} ;
+  [Comp] = {first,last : Agr => Str} ;
+  [Imp] = {first,last : Polarity => Number => Str} ;
+
+oper
+  baseVP : Verb -> VP = \v -> lin VP {
+    indicative = \\t,n,p,_,_ => v.indicative ! t ! n ! p ;
+    subjunctive = \\n,p,_,_ => subjunctiveForm v.vtype
+      (v.indicative ! ResSqi.Pres ! Sg ! P1)
+      (v.indicative ! ResSqi.Pres ! n ! p) n p ;
+    imperative = \\n,_ => v.imperative ! n ;
+    participle = \\_,_ => v.participle ;
+    pres_optative = \\n,p,_ => v.pres_optative ! n ! p ;
+    perf_optative = \\n,p,_ => v.perf_optative ! n ! p ;
+    pres_admirative = \\n,p,_ => v.pres_admirative ! n ! p ;
+    imperf_admirative = \\n,p,_ => v.imperf_admirative ! n ! p ;
+    vtype = v.vtype
+  } ;
+
+  extAddVP : VP -> (Agr => Str) -> VP = \v,x -> v ** {
+    indicative = \\t,n,p,g,c => v.indicative ! t ! n ! p ! g ! c ++
+      x ! {gn=genNum g n; p=p} ;
+    subjunctive = \\n,p,g,c => v.subjunctive ! n ! p ! g ! c ++
+      x ! {gn=genNum g n; p=p} ;
+    imperative = \\n,c => v.imperative ! n ! c ++
+      x ! {gn=case n of {Sg=>GSg Masc; Pl=>GPl}; p=P2} ;
+    participle = \\a,c => v.participle ! a ! c ++ x ! a
+  } ;
+
+  baseSlashVP : VPSlash -> VP = \v -> lin VP {
+    indicative = \\t,n,p,_,_ => v.indicative ! t ! n ! p ;
+    subjunctive = \\n,p,_,_ => v.subjunctive ! n ! p ;
+    imperative = \\n,_ => v.imperative ! n ;
+    participle = \\_,_ => v.participle ;
+    pres_optative = \\n,p,_ => v.pres_optative ! n ! p ;
+    perf_optative = \\n,p,_ => v.perf_optative ! n ! p ;
+    pres_admirative = \\n,p,_ => v.pres_admirative ! n ! p ;
+    imperf_admirative = \\n,p,_ => v.imperf_admirative ! n ! p ;
+    vtype = v.vtype
+  } ;
+
+lin
+  GenModNP n np cn = {
+    s = \\c => cn.s ! Def ! c ! n.n ++
+                 link_clitic ! Def ! c ! cn.g ! n.n ++ np.s ! Ablat ;
+    a = agrgP3 cn.g n.n
+  } ;
+
+  EmptyRelSlash cl = {s=\\_,t,a,p=>"që"++cl.s!t!a!p++cl.c2.s} ;
+
+  ReflPron = {
+    s = \\a,c => case <agrNumber a,c> of {
+      <Sg,Acc> => "veten" ; <Pl,Acc> => "veten" ; _ => "vetes"
+    } ;
+    isPron = True
+  } ;
+  ReflPoss n cn = {s=\\_,c=>cn.s!Def!c!n.n; isPron=False} ;
+  PredetRNP p r = r ** {s=\\a,c=>p.s++r.s!a!c} ;
+  AdvRNP np p r = {s=\\a,c=>np.s!c++p.s++r.s!a!p.c; isPron=False} ;
+  AdvRVP vp p r = extAddVP vp (\\a=>p.s++r.s!a!p.c) ;
+  AdvRAP ap p r = {
+    s=\\sp,c,g,n=>ap.s!sp!c!g!n++p.s++r.s!(agrgP3 g n)!p.c
+  } ;
+  PossPronRNP p n cn r = {
+    s=\\c=>cn.s!Def!c!n.n++link_clitic!Def!c!cn.g!n.n++r.s!p.a!Ablat;
+    a=agrgP3 cn.g n.n
+  } ;
+
+  CompoundN a b = {
+    s=\\sp,c,n=>(UseN b).s!sp!c!n++(UseN a).s!Indef!Ablat!Sg;
+    g=b.g
+  } ;
+  CompoundAP n a = {
+    s=\\sp,c,g,num=>(UseN n).s!Indef!Nom!Sg++(PositA a).s!sp!c!g!num
+  } ;
+  GerundCN vp = {s=\\_,_,_=>vp.participle!{gn=GSg Masc;p=P3}!Nom; g=Masc} ;
+  GerundNP vp = {s=\\_=>vp.participle!{gn=GSg Masc;p=P3}!Nom; a={gn=GSg Masc;p=P3}} ;
+  GerundAdv vp = {s="duke"++vp.participle!{gn=GSg Masc;p=P3}!Nom} ;
+  WithoutVP vp = {s="pa"++vp.participle!{gn=GSg Masc;p=P3}!Nom} ;
+  ByVP vp = {s="duke"++vp.participle!{gn=GSg Masc;p=P3}!Nom} ;
+  ApposNP a b = a ** {s=\\c=>a.s!c++SOFT_BIND++","++b.s!c} ;
+  PositAdVAdj a = {s=a.s!Nom!Masc!Sg} ;
+  UttVPShort vp = {s=vp.imperative!Sg!Nom} ;
+  ComplSlashPartLast sl np = ComplSlash sl np ;
+
+  PresPartAP vp = {s=\\_,_,_,_=>"duke"++vp.participle!{gn=GSg Masc;p=P3}!Nom} ;
+  PastPartAP sl = {s=\\_,_,_,_=>sl.participle} ;
+  PastPartAgentAP sl np = {
+    s=\\_,_,_,_=>sl.participle++"nga"++np.s!Nom
+  } ;
+  PassVPSlash sl = extAddVP (baseVP I.jam_V) (\\_=>sl.participle) ;
+  PassAgentVPSlash sl np =
+    extAddVP (baseVP I.jam_V) (\\_=>sl.participle++"nga"++np.s!Nom) ;
+  ProgrVPSlash sl = sl ;
+  ComplBareVS v s = extAddVP (baseVP v) (\\_=>s.s) ;
+
+  MkVPS t p vp = {
+    s=\\a=>(PredVP {s=\\_=>[];a=a} vp).s!t.t!t.a!p.p
+  } ;
+  BaseVPS x y = {first=x.s; last=y.s} ;
+  ConsVPS x xs = {first=\\a=>x.s!a++","++xs.first!a; last=xs.last} ;
+  ConjVPS c xs = {s=\\a=>xs.first!a++c.s++xs.last!a} ;
+  PredVPS np v = {s=v.s!np.a} ;
+
+  MkVPI vp = {s=\\a=>"të"++vp.subjunctive ! agrNumber a ! a.p ! agrGender a ! Nom} ;
+  BaseVPI x y = {first=x.s; last=y.s} ;
+  ConsVPI x xs = {first=\\a=>x.s!a++","++xs.first!a; last=xs.last} ;
+  ConjVPI c xs = {s=\\a=>xs.first!a++c.s++xs.last!a} ;
+  ComplVPIVV v x = extAddVP (baseVP v) (\\a=>x.s!a) ;
+
+  BaseComp x y = {first=x.s; last=y.s} ;
+  ConsComp x xs = {first=\\a=>x.s!a++","++xs.first!a; last=xs.last} ;
+  ConjComp c xs = {s=\\a=>xs.first!a++c.s++xs.last!a} ;
+
+  BaseImp x y = {first=x.s; last=y.s} ;
+  ConsImp x xs = {
+    first=\\p,n=>x.s!p!n++","++xs.first!p!n;
+    last=xs.last
+  } ;
+  ConjImp c xs = {s=\\p,n=>xs.first!p!n++c.s++xs.last!p!n} ;
+
+  UseDAP d = {s=\\_=>d.s; a=agrgP3 Masc d.n} ;
+  UseDAPMasc = UseDAP ;
+  UseDAPFem d = {s=\\_=>d.s; a=agrgP3 Fem d.n} ;
+  TPastSimple = {s=[]; t=ParamX.Past} ;
+}

src/albanian/GrammarSqi.gf

@@ -0,0 +1,17 @@
+concrete GrammarSqi of Grammar =
+  NounSqi,
+  VerbSqi,
+  AdjectiveSqi,
+  AdverbSqi,
+  SentenceSqi,
+  QuestionSqi,
+  RelativeSqi,
+  ConjunctionSqi,
+  NumeralSqi,
+  PhraseSqi,
+  IdiomSqi,
+  NamesSqi,
+  StructuralSqi
+  ** {
+
+} ;

src/albanian/IdiomSqi.gf

@@ -0,0 +1,23 @@
+concrete IdiomSqi of Idiom = CatSqi ** open Prelude, ParamX, ResSqi in {
+lin
+  ImpersCl vp = {s=\\t,a,p=>negation p++futureParticle t++vp.indicative!sqiTense t!Sg!P3!Masc!Nom} ;
+  GenericCl vp = {s=\\t,a,p=>"njeriu"++negation p++futureParticle t++vp.indicative!sqiTense t!Sg!P3!Masc!Nom} ;
+  CleftNP np rs = {s=\\_,_,_=>np.s!Nom++rs.s!np.a} ;
+  CleftAdv adv s = {s=\\_,_,_=>adv.s++s.s} ;
+  ExistNP np = {s=\\t,_,p=>negation p++case t of {ParamX.Past=>"pati";_=>"ka"}++np.s!Acc} ;
+  ExistIP ip = {s=\\_,_,p=>negation p++"ka"++ip.s} ;
+  ExistNPAdv np adv = {s=\\t,a,p=>(ExistNP np).s!t!a!p++adv.s} ;
+  ExistIPAdv ip adv = {s=\\t,a,p=>(ExistIP ip).s!t!a!p++adv.s} ;
+  ProgrVP vp = vp ;
+  ImpPl1 vp = {s="le të"++vp.subjunctive!Pl!P1!Masc!Nom} ;
+  ImpP3 np vp = {s="le"++np.s!Nom++"të"++vp.subjunctive!agrNumber np.a!np.a.p!agrGender np.a!Nom} ;
+  SelfAdvVP vp = vp ** {
+    indicative=\\t,n,p,g,c=>vp.indicative!t!n!p!g!c++"vetë";
+    subjunctive=\\n,p,g,c=>vp.subjunctive!n!p!g!c++"vetë"
+    } ;
+  SelfAdVVP vp = vp ** {
+    indicative=\\t,n,p,g,c=>"vetë"++vp.indicative!t!n!p!g!c;
+    subjunctive=\\n,p,g,c=>"vetë"++vp.subjunctive!n!p!g!c
+    } ;
+  SelfNP np = np ** {s=\\c=>np.s!c++"vetë"} ;
+}

src/albanian/IrregSqi.gf

@@ -0,0 +1,24 @@
+concrete IrregSqi of IrregSqiAbs = CatSqi ** open ParadigmsSqi in {
+
+lin
+  bej_V  = irregV "bëj"  "bën"  "bën"   "bëjmë"  "bëni"  "bëjnë"  "bëj"  "bëni"  "bërë" ;
+  bie_V  = irregV "bie"  "bie"  "bie"   "biem"  "bini"  "bien"   "bjer" "bini"  "rënë" ;
+  dal_V  = irregV "dal"  "del"  "del"   "dalim"  "dilni" "dalin"  "dil"  "dilni" "dalë" ;
+  dua_V  = irregV "dua"  "do"   "do"    "duam"   "doni"  "duan"   "duaj" "doni"  "dashur" ;
+  eci_V  = irregV "eci"  "ecën" "ecën"  "ecim"  "ecni"  "ecin"   "ec"   "ecni"  "ecur" ;
+  ha_V   = irregV "ha"   "ha"   "ha"    "hamë"   "hani"  "hanë"   "ha"   "hani"  "ngrënë" ;
+  hyj_V  = irregV "hyj"  "hyn"  "hyn"   "hyjmë"  "hyni"  "hyjnë"  "hyr"  "hyni"  "hyrë" ;
+  iki_V  = irregV "iki"  "ikën" "ikën"  "ikim"  "ikni"  "ikin"   "ik"   "ikni"  "ikur" ;
+  jam_V  = irregV "jam"  "je"   "është" "jemi"  "jeni"  "janë"   "ji"   "jini"  "qenë" ;
+  jap_V  = irregV "jap"  "jep"  "jep"   "japim"  "jepni" "japin"  "jep"  "jepni" "dhënë" ;
+  kam_V  = irregV "kam"  "ke"   "ka"    "kemi"  "keni"  "kanë"   "ki"   "kini"  "pasur" ;
+  ngre_V = irregV "ngre" "ngre" "ngre"  "ngremë" "ngrini" "ngrenë" "ngre" "ngrini" "ngritur" ;
+  njoh_V = irregV "njoh" "njeh" "njeh"  "njohim" "njihni" "njohin" "njih" "njihni" "njohur" ;
+  pi_V   = irregV "pi"   "pi"   "pi"    "pimë"   "pini"  "pinë"   "pi"   "pini"  "pirë" ;
+  shoh_V = irregV "shoh" "sheh" "sheh"  "shohim" "shihni" "shohin" "shih" "shihni" "parë" ;
+  them_V = irregV "them" "thua" "thotë" "themi"  "thoni" "thonë"  "thuaj" "thoni" "thënë" ;
+  urrej_V = irregV "urrej" "urren" "urren" "urrejmë" "urreni" "urrejnë" "urre" "urreni" "urryer" ;
+  ve_V   = irregV "vë"   "vë"   "vë"    "vëmë"   "vini"  "vënë"   "vër"  "vini"  "vënë" ;
+  vij_V  = irregV "vij"  "vjen" "vjen"  "vijmë"  "vini"  "vijnë"  "eja"  "ejani" "ardhur" ;
+
+}

src/albanian/IrregSqiAbs.gf

@@ -0,0 +1,24 @@
+abstract IrregSqiAbs = Cat ** {
+
+fun
+  bej_V  : V ;
+  bie_V  : V ;
+  dal_V  : V ;
+  dua_V  : V ;
+  eci_V  : V ;
+  ha_V   : V ;
+  hyj_V  : V ;
+  iki_V  : V ;
+  jam_V  : V ;
+  jap_V  : V ;
+  kam_V  : V ;
+  ngre_V : V ;
+  njoh_V : V ;
+  pi_V   : V ;
+  shoh_V : V ;
+  them_V : V ;
+  urrej_V : V ;
+  ve_V   : V ;
+  vij_V  : V ;
+
+}

src/albanian/LangSqi.gf

@@ -0,0 +1,11 @@
+--# -path=.:../abstract
+concrete LangSqi of Lang =
+  GrammarSqi,
+  LexiconSqi
+  ,ConstructionSqi
+  ,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/NamesSqi.gf

@@ -0,0 +1,12 @@
+concrete NamesSqi of Names = CatSqi ** open ResSqi in {
+lin
+  GivenName n = {s=\\_=>n.s; a={gn=GSg Masc;p=P3}} ;
+  MaleSurname n = {s=\\_=>n.s; a={gn=GSg Masc;p=P3}} ;
+  FemaleSurname n = {s=\\_=>n.s; a={gn=GSg Fem;p=P3}} ;
+  PlSurname n = {s=\\_=>n.s; a={gn=GPl;p=P3}} ;
+  FullName n s = {s=\\_=>n.s++s.s; a={gn=GSg Masc;p=P3}} ;
+  UseLN n = {s=\\_=>n.s; a={gn=GSg Masc;p=P3}} ;
+  PlainLN n = {s=\\_=>n.s; a={gn=GSg Masc;p=P3}} ;
+  InLN n = {s="në"++n.s} ;
+  AdjLN a n = {s=n.s++a.s!Def!Nom!Masc!Sg} ;
+}

src/albanian/NounSqi.gf

@@ -0,0 +1,130 @@
+concrete NounSqi of Noun = CatSqi ** open MorphoSqi, ResSqi, Prelude in {
+
+  lin
+    DetCN det cn = {
+      s = \\c => det.s ! c ! cn.g ++ cn.s ! det.sp ! c ! det.n ++
+                  det.post ! det.sp ! c ! cn.g ;
+      a = agrgP3 cn.g det.n
+      } ;
+
+    UsePron p = {s=p.s; a=p.a} ;
+    UsePN p = {s=\\_=>p.s; a={gn=GSg Masc;p=P3}} ;
+    PredetNP p np = np ** {s=\\c=>p.s ++ np.s ! c} ;
+    AdvNP np adv = np ** {s=\\c=>np.s ! c ++ adv.s} ;
+    ExtAdvNP np adv = np ** {s=\\c=>np.s ! c ++ SOFT_BIND ++ "," ++ adv.s} ;
+    MassNP cn = {s=\\c=>cn.s ! Indef ! c ! Sg; a=agrgP3 cn.g Sg} ;
+
+    DetQuant quant num = {
+      s  = \\c,g => case quant.isPoss of {
+        True => num.s;
+        False => quant.s ! c ! g ! num.n ++ num.s
+        } ;
+      post = \\_,c,g => case quant.isPoss of {
+        True => quant.s ! c ! g ! num.n;
+        False => []
+        } ;
+      n  = num.n ;
+      sp = quant.sp
+      } ;
+
+    DetQuantOrd quant num ord = {
+      s = \\c,g => case quant.isPoss of {
+        True => num.s;
+        False => quant.s ! c ! g ! num.n ++ num.s
+        } ;
+      post = \\_,c,g => case quant.isPoss of {
+        True => quant.s ! c ! g ! num.n ++ ord.s ! c ! g ! num.n;
+        False => ord.s ! c ! g ! num.n
+        } ;
+      n=num.n; sp=quant.sp
+      } ;
+
+    NumSg = {s = []; n = Sg} ;
+    NumPl = {s = []; n = Pl} ;
+    NumCard c = {s=c.s; n=Pl} ;
+    NumNumeral n = n ;
+    NumDecimal n = {s=n.s} ;
+    AdNum a n = {s=a.s ++ n.s} ;
+
+    OrdNumeral n = {s=\\_,_,_=>n.s} ;
+    OrdDigits n = {s=\\_,_,_=>n.s} ;
+    OrdSuperl a = {s=\\c,g,n=>"më" ++
+      case a.clit of {
+        True => case <c,g,n> of {
+          <Nom,Masc,Sg> => "i" ++ a.s ! c ! g ! n;
+          <Nom,Fem,Sg> => "e" ++ a.s ! c ! g ! n;
+          _ => "të" ++ a.s ! c ! g ! n
+          };
+        False => a.s ! c ! g ! n
+        }} ;
+    OrdNumeralSuperl n a = {s=\\c,g,num=>n.s ++ a.s ! c ! g ! num} ;
+
+    DefArt = {
+      s  = \\c,g,n => [] ;
+      sp = Def;
+      isPoss = False
+      } ;
+
+    IndefArt = {
+      s = \\c,g => table Number ["një"; []] ;
+      sp = Indef;
+      isPoss = False
+      } ;
+
+    UseN n = n ;
+
+    ComplN2 n np = {
+      s=\\sp,c,num=>n.s ! sp ! c ! num ++ n.c2.s ++ np.s ! n.c2.c;
+      g=n.g
+      } ;
+    ComplN3 n np = n ** {s=\\sp,c,num=>n.s ! sp ! c ! num ++ n.c2.s ++ np.s ! n.c2.c; c2=n.c3} ;
+    Use2N3 n = n ** {c2=n.c2} ;
+    Use3N3 n = n ** {c2=n.c3} ;
+    RelCN cn rs = cn ** {s=\\sp,c,n=>cn.s ! sp ! c ! n ++ rs.s ! agrgP3 cn.g n} ;
+    AdvCN cn adv = cn ** {s=\\sp,c,n=>cn.s ! sp ! c ! n ++ adv.s} ;
+    SentCN cn sc = cn ** {s=\\sp,c,n=>cn.s ! sp ! c ! n ++ sc.s} ;
+    ApposCN cn np = cn ** {s=\\sp,c,n=>cn.s ! sp ! c ! n ++ np.s ! c} ;
+    PossNP cn np = cn ** {
+      s=\\sp,c,n=>cn.s ! sp ! c ! n ++
+                    link_clitic ! sp ! c ! cn.g ! n ++ np.s ! Ablat
+      } ;
+    PartNP cn np = cn ** {s=\\sp,c,n=>cn.s ! sp ! c ! n ++ "me" ++ np.s ! Acc} ;
+    CountNP det np = {s=\\c=>det.s ! c ! Masc ++ "nga" ++ np.s ! Ablat; a=agrgP3 Masc det.n} ;
+
+    PossPron p = {
+      s=\\c,g,n=>case <p.a.gn,p.a.p,g,n> of {
+        <GSg _,P1,Masc,Sg> => case c of {Nom=>"im"; _=>"tim"};
+        <GSg _,P1,Fem,Sg> => case c of {Nom=>"ime"; Acc=>"time"; _=>"sime"};
+        <GSg _,P2,Masc,Sg> => case c of {Nom=>"yt"; _=>"tënd"};
+        <GSg _,P2,Fem,Sg> => case c of {Nom=>"jote"; Acc=>"tënde"; _=>"sate"};
+        <GSg Masc,P3,_,_> => link_clitic!Def!c!g!n++"tij";
+        <GSg Fem,P3,_,_> => link_clitic!Def!c!g!n++"saj";
+        <GPl,P3,_,_> => link_clitic!Def!c!g!n++"tyre";
+        <GSg _,P1,Masc,Pl> => link_clitic!Def!c!g!n++"mi";
+        <GSg _,P1,Fem,Pl> => link_clitic!Def!c!g!n++"mia";
+        <GSg _,P2,Masc,Pl> => link_clitic!Def!c!g!n++"tu";
+        <GSg _,P2,Fem,Pl> => link_clitic!Def!c!g!n++"tua";
+        <GPl,P1,Masc,Sg> => case c of {Nom=>"ynë"; _=>"tonë"};
+        <GPl,P1,Fem,Sg> => case c of {Nom=>"jonë"; Acc=>"tonë"; _=>"sonë"};
+        <GPl,P1,Masc,Pl> => "tanë";
+        <GPl,P1,Fem,Pl> => "tona";
+        <GPl,P2,_,Sg> => case c of {Nom=>"juaj"; _=>"tuaj"};
+        <GPl,P2,_,Pl> => "tuaj"
+      };
+      sp=Def;
+      isPoss=True
+      } ;
+
+    DetDAP det = {
+      s=det.s ! Nom ! Masc ++ det.post ! det.sp ! Nom ! Masc;
+      n=det.n
+      } ;
+    AdjDAP dap ap = {s=dap.s ++ ap.s ! Indef ! Nom ! Masc ! dap.n; n=dap.n} ;
+    QuantityNP dec mu = {s=\\_=>case mu.isPre of {True=>mu.s++dec.s; False=>dec.s++mu.s}; a=agrgP3 Masc Pl} ;
+
+    AdjCN ap cn = {
+      s = \\sp,c,n => cn.s ! sp ! c ! n ++ ap.s ! sp ! c ! cn.g ! n ;
+      g = cn.g
+      } ;
+
+}

src/albanian/NumeralSqi.gf

@@ -0,0 +1,102 @@
+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 } ;
+lincat Sub1000000000 = {s : Str} ;
+lincat Sub1000000000000 = {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 pot21 = mkR "një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} ;
+lin pot31 = {s="një mijë"} ;
+lin pot3as4 n=n ;
+lin pot3decimal n={s=n.s++"mijë"} ;
+lin pot41={s="një milion"} ;
+lin pot4 n={s=n.s++"milionë"} ;
+lin pot4plus n m={s=n.s++"milionë"++m.s} ;
+lin pot4decimal n={s=n.s++"milionë"} ;
+lin pot4as5 n=n ;
+lin pot51={s="një miliard"} ;
+lin pot5 n={s=n.s++"miliardë"} ;
+lin pot5plus n m={s=n.s++"miliardë"++m.s} ;
+lin pot5decimal n={s=n.s++"miliardë"} ;
+
+
+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,27 @@
+concrete PhraseSqi of Phrase = CatSqi ** open Prelude, ResSqi in {
+
+  lin
+    PhrUtt pconj utt voc = {s = pconj.s ++ utt.s ++ voc.s} ;
+
+    UttS s = s ;
+    UttQS s = s ;
+    UttImpSg p i = {s=i.s ! p.p ! Sg} ;
+    UttImpPl p i = {s=i.s ! p.p ! Pl} ;
+    UttImpPol p i = {s=i.s ! p.p ! Pl} ;
+    UttIP ip = {s=ip.s} ;
+    UttIAdv a = a ;
+    UttNP np = {s = np.s ! Nom} ;
+    UttAdv a = a ;
+    UttVP vp = {s="të" ++ vp.subjunctive ! Sg ! P3 ! Masc ! Nom} ;
+    UttCN cn = {s=cn.s ! Indef ! Nom ! Sg} ;
+    UttCard c = c ;
+    UttAP ap = {s=ap.s ! Indef ! Nom ! Masc ! Sg} ;
+    UttInterj i = i ;
+
+    NoPConj = {s = []} ;
+    PConjConj c = c ;
+
+    NoVoc = {s = []} ;
+    VocNP np = {s=SOFT_BIND ++ "," ++ np.s ! Nom} ;
+
+}

src/albanian/QuestionSqi.gf

@@ -0,0 +1,21 @@
+concrete QuestionSqi of Question = CatSqi ** open Prelude, ParamX, ResSqi, (I=IrregSqi) in {
+lincat QVP = {s : Str} ;
+lin
+  QuestCl cl = cl ;
+  QuestVP ip vp = {s=\\t,a,p=>ip.s++negation p++futureParticle t++vp.indicative!sqiTense t!agrNumber ip.a!ip.a.p!agrGender ip.a!Nom} ;
+  QuestSlash ip cl = {s=\\t,a,p=>ip.s++cl.s!t!a!p++cl.c2.s} ;
+  QuestIAdv i cl = {s=\\t,a,p=>i.s++cl.s!t!a!p} ;
+  QuestIComp i np = {s=\\_,_,_=>i.s++(lin Verb I.jam_V).indicative!ResSqi.Pres!agrNumber np.a!np.a.p++np.s!Nom} ;
+  IdetCN d cn = {s=d.s!cn.g++cn.s!Indef!Nom!d.n; a=agrgP3 cn.g d.n} ;
+  IdetIP d = {s=d.s!Masc; a=agrgP3 Masc d.n} ;
+  AdvIP ip a = ip ** {s=ip.s++a.s} ;
+  IdetQuant q n = {s=\\g=>q.s!g++n.s; n=n.n} ;
+  PrepIP p ip = {s=p.s++ip.s} ;
+  AdvIAdv i a = {s=i.s++a.s} ;
+  CompIAdv i = i ;
+  CompIP ip = {s=ip.s} ;
+  ComplSlashIP sl ip = {s=sl.indicative!ResSqi.Pres!Sg!P3++sl.c2.s++ip.s} ;
+  AdvQVP vp i = {s=vp.indicative!ResSqi.Pres!Sg!P3!Masc!Nom++i.s} ;
+  AddAdvQVP q i = {s=q.s++i.s} ;
+  QuestQVP ip q = {s=\\_,_,_=>ip.s++q.s} ;
+}

src/albanian/RelativeSqi.gf

@@ -0,0 +1,8 @@
+concrete RelativeSqi of Relative = CatSqi ** open ParamX, ResSqi in {
+lin
+  RelCl cl = {s=\\_,t,a,p=>"që"++cl.s!t!a!p} ;
+  RelVP rp vp = {s=\\agr,t,a,p=>rp.s!Nom!agr.gn++negation p++futureParticle t++vp.indicative!sqiTense t!agrNumber agr!agr.p!agrGender agr!Nom} ;
+  RelSlash rp cl = {s=\\agr,t,a,p=>rp.s!cl.c2.c!agr.gn++cl.s!t!a!p++cl.c2.s} ;
+  IdRP = {s=\\_,_=>"që"} ;
+  FunRP prep np rp = {s=\\c,g=>prep.s++np.s!prep.c++rp.s!c!g} ;
+}

src/albanian/ResSqi.gf

@@ -0,0 +1,320 @@
+resource ResSqi = ParamX-[Tense,Past,Pres] ** open Prelude in {
+
+oper Compl = {s : Str; c : Case} ;
+
+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 agrNumber : Agr -> Number = \a -> case a.gn of {
+       GSg _ => Sg ;
+       GPl   => Pl
+     } ;
+
+oper agrGender : Agr -> Gender = \a -> case a.gn of {
+       GSg g => g ;
+       GPl   => Masc
+     } ;
+
+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 ;
+param VType = VNormal | VRefl | VJ ;
+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; vtype : VType} ; -- 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
+                                        }
+                                } ;
+            vtype = VNormal
+          } ;
+
+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} ;
+
+oper sqiTense : ParamX.Tense -> Tense = \t -> case t of {
+       ParamX.Pres => Pres ;
+       ParamX.Past => Aorist ;
+       ParamX.Fut  => Pres ;
+       ParamX.Cond => Imperfect
+     } ;
+
+oper negation : Polarity -> Str = \p -> case p of {
+       Pos => [] ;
+       Neg => "nuk"
+     } ;
+
+oper futureParticle : ParamX.Tense -> Str = \t -> case t of {
+       ParamX.Fut  => "do" ++ "të" ;
+       ParamX.Cond => "do" ++ "të" ;
+       _           => []
+     } ;
+
+oper subjunctiveForm : VType -> Str -> Str -> Number -> Person -> Str =
+  \vt,citation,fallback,n,p -> case vt of {
+    VJ => case <n,p> of {
+      <Sg,P1> => citation ;
+      <Sg,P3> => citation ++ BIND ++ "ë" ;
+      _ => fallback
+      } ;
+    _ => fallback
+  } ;
+
+oper haveAux : ParamX.Tense => Number => Person => Str = table {
+       ParamX.Pres => table {
+         Sg => table {P1 => "kam"; P2 => "ke"; P3 => "ka"};
+         Pl => table {P1 => "kemi"; P2 => "keni"; P3 => "kanë"}
+       } ;
+       ParamX.Past => table {
+         Sg => table {P1 => "kisha"; P2 => "kishe"; P3 => "kishte"};
+         Pl => table {P1 => "kishim"; P2 => "kishit"; P3 => "kishin"}
+       } ;
+       ParamX.Fut => table {
+         Sg => table {P1 => "do të kem"; P2 => "do të kesh"; P3 => "do të ketë"};
+         Pl => table {P1 => "do të kemi"; P2 => "do të keni"; P3 => "do të kenë"}
+       } ;
+       ParamX.Cond => table {
+         Sg => table {P1 => "do të kisha"; P2 => "do të kishe"; P3 => "do të kishte"};
+         Pl => table {P1 => "do të kishim"; P2 => "do të kishit"; P3 => "do të kishin"}
+       }
+     } ;
+
+}

src/albanian/SentenceSqi.gf

@@ -0,0 +1,46 @@
+concrete SentenceSqi of Sentence = CatSqi ** open Prelude, ParamX, ResSqi in {
+
+oper
+  mkClause : Str -> Agr -> VP -> ParamX.Tense -> Anteriority -> Polarity -> Str =
+    \subj,a,vp,t,ant,pol -> case <ant,t> of {
+      <Simul,ParamX.Past> => subj ++ negation pol ++
+               haveAux ! ParamX.Pres ! agrNumber a ! a.p ++ vp.participle ! a ! Nom ;
+      <Simul,_> => subj ++ negation pol ++ futureParticle t ++
+               vp.indicative ! sqiTense t ! agrNumber a ! a.p ! agrGender a ! Nom ;
+      <Anter,_> => subj ++ negation pol ++ haveAux ! t ! agrNumber a ! a.p ++
+               vp.participle ! a ! Nom
+    } ;
+
+lin
+  PredVP np vp = {s = \\t,a,p => mkClause (np.s ! Nom) np.a vp t a p} ;
+  PredSCVP sc vp = {s = \\t,a,p => mkClause sc.s {gn=GSg Masc; p=P3} vp t a p} ;
+
+  SlashVP np sl = {
+    s = \\t,a,p => np.s ! Nom ++ negation p ++ futureParticle t ++
+          sl.indicative ! sqiTense t ! agrNumber np.a ! np.a.p ;
+    c2 = sl.c2
+  } ;
+  AdvSlash cl adv = cl ** {s = \\t,a,p => cl.s ! t ! a ! p ++ adv.s} ;
+  SlashPrep cl prep = {s = cl.s; c2 = prep} ;
+  SlashVS np vs ss = {
+    s = \\t,a,p => np.s ! Nom ++ negation p ++ vs.indicative ! sqiTense t ! agrNumber np.a ! np.a.p ++ "që" ++ ss.s ;
+    c2 = {s=[]; c=Acc}
+  } ;
+
+  ImpVP vp = {s = \\pol,n => case pol of {Pos => []; Neg => "mos"} ++ vp.imperative ! n ! Nom} ;
+  AdvImp adv imp = {s = \\p,n => adv.s ++ imp.s ! p ! n} ;
+
+  EmbedS s = {s = "që" ++ s.s} ;
+  EmbedQS q = {s = q.s} ;
+  EmbedVP vp = {s = "të" ++ vp.subjunctive ! Sg ! P3 ! Masc ! Nom} ;
+
+  UseCl t p cl = {s = cl.s ! t.t ! t.a ! p.p} ;
+  UseQCl t p cl = {s = cl.s ! t.t ! t.a ! p.p} ;
+  UseRCl t p cl = {s = \\a => cl.s ! a ! t.t ! t.a ! p.p} ;
+  UseSlash t p cl = {s = cl.s ! t.t ! t.a ! p.p; c2=cl.c2} ;
+
+  AdvS adv s = {s = adv.s ++ s.s} ;
+  ExtAdvS adv s = {s = adv.s ++ SOFT_BIND ++ "," ++ s.s} ;
+  SSubjS s1 subj s2 = {s = s1.s ++ subj.s ++ s2.s} ;
+  RelS s rs = {s = s.s ++ SOFT_BIND ++ "," ++ rs.s ! {gn=GSg Masc;p=P3}} ;
+}

src/albanian/StructuralSqi.gf

@@ -0,0 +1,122 @@
+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" ;
+
+lin
+  youPol_Pron = youPl_Pron ;
+
+  and_Conj = mkConj "dhe" ;
+  or_Conj = mkConj "ose" ;
+  if_then_Conj = mkConj "nëse" ;
+
+  above_Prep = mkPrep "mbi" ;
+  after_Prep = mkPrep "pas" ;
+  before_Prep = mkPrep "para" ;
+  behind_Prep = mkPrep "prapa" ;
+  between_Prep = mkPrep "midis" ;
+  by8agent_Prep = mkPrep "nga" ;
+  by8means_Prep = mkPrep "me" ;
+  during_Prep = mkPrep "gjatë" ;
+  except_Prep = mkPrep "përveç" ;
+  for_Prep = mkPrep "për" ;
+  from_Prep = mkPrep "nga" ;
+  in8front_Prep = mkPrep "përpara" ;
+  in_Prep = mkPrep "në" ;
+  on_Prep = mkPrep "mbi" ;
+  part_Prep = mkPrep "nga" ;
+  possess_Prep = mkPrep "i" ;
+  through_Prep = mkPrep "përmes" ;
+  to_Prep = mkPrep "te" ;
+  under_Prep = mkPrep "nën" ;
+  with_Prep = mkPrep "me" ;
+  without_Prep = mkPrep "pa" ;
+
+  although_Subj = mkSubj "megjithëse" ;
+  because_Subj = mkSubj "sepse" ;
+  if_Subj = mkSubj "nëse" ;
+  that_Subj = mkSubj "që" ;
+  when_Subj = mkSubj "kur" ;
+
+  always_AdV = mkAdV "gjithmonë" ;
+  almost_AdA = mkAdA "pothuajse" ;
+  so_AdA = mkAdA "kaq" ;
+  too_AdA = mkAdA "tepër" ;
+  very_AdA = mkAdA "shumë" ;
+  almost_AdN = mkAdN "pothuajse" ;
+  at_least_AdN = mkAdN "të paktën" ;
+  at_most_AdN = mkAdN "më së shumti" ;
+  more_CAdv = {s="më";p="se"} ;
+  less_CAdv = {s="më pak";p="se"} ;
+  as_CAdv = {s="po aq";p="sa"} ;
+
+  here_Adv = mkAdv "këtu" ;
+  there_Adv = mkAdv "atje" ;
+  everywhere_Adv = mkAdv "kudo" ;
+  somewhere_Adv = mkAdv "diku" ;
+  here7from_Adv = mkAdv "nga këtu" ;
+  here7to_Adv = mkAdv "deri këtu" ;
+  there7from_Adv = mkAdv "nga atje" ;
+  there7to_Adv = mkAdv "deri atje" ;
+  quite_Adv = mkAdv "mjaft" ;
+
+  how_IAdv = mkIAdv "si" ;
+  how8much_IAdv = mkIAdv "sa" ;
+  when_IAdv = mkIAdv "kur" ;
+  where_IAdv = mkIAdv "ku" ;
+  why_IAdv = mkIAdv "pse" ;
+  which_IQuant = {s=table {Masc=>"cili";Fem=>"cila"}} ;
+  how8many_IDet = {s=\\_=>"sa";n=Pl} ;
+  whatSg_IP = {s="çfarë";a={gn=GSg Masc;p=P3}} ;
+  whatPl_IP = {s="çfarë";a={gn=GPl;p=P3}} ;
+  whoSg_IP = {s="kush";a={gn=GSg Masc;p=P3}} ;
+  whoPl_IP = {s="cilët";a={gn=GPl;p=P3}} ;
+
+  all_Predet = {s="të gjithë"} ;
+  most_Predet = {s="shumica e"} ;
+  not_Predet = {s="jo"} ;
+  only_Predet = {s="vetëm"} ;
+
+  every_Det = {s=\\_,_=>"çdo";post=\\_,_,_=>[];sp=Indef;n=Sg} ;
+  few_Det = {s=\\_,_=>"pak";post=\\_,_,_=>[];sp=Indef;n=Pl} ;
+  many_Det = {s=\\_,_=>"shumë";post=\\_,_,_=>[];sp=Indef;n=Pl} ;
+  much_Det = {s=\\_,_=>"shumë";post=\\_,_,_=>[];sp=Indef;n=Sg} ;
+  someSg_Det = {s=\\_,_=>"një";post=\\_,_,_=>[];sp=Indef;n=Sg} ;
+  somePl_Det = {s=\\_,_=>"disa";post=\\_,_,_=>[];sp=Indef;n=Pl} ;
+  no_Quant = mkQuant "asnjë" ;
+
+  everybody_NP = {s=\\_=>"të gjithë";a={gn=GPl;p=P3}} ;
+  everything_NP = {s=\\_=>"gjithçka";a={gn=GSg Masc;p=P3}} ;
+  nobody_NP = {s=\\_=>"askush";a={gn=GSg Masc;p=P3}} ;
+  nothing_NP = {s=\\_=>"asgjë";a={gn=GSg Masc;p=P3}} ;
+  somebody_NP = {s=\\_=>"dikush";a={gn=GSg Masc;p=P3}} ;
+  something_NP = {s=\\_=>"diçka";a={gn=GSg Masc;p=P3}} ;
+
+  can_VV = mkVV (mkV "mund") ;
+  can8know_VV = mkVV (irregV "di" "di" "di" "dimë" "dini" "dinë" "di" "dini" "ditur") ;
+  must_VV = mkVV (mkV "duhet") ;
+  want_VV = mkVV (irregV "dua" "do" "do" "duam" "doni" "duan" "duaj" "doni" "dashur") ;
+  have_V2 = mkV2 (irregV "kam" "ke" "ka" "kemi" "keni" "kanë" "ki" "kini" "pasur") ;
+
+  but_PConj = {s="por"} ;
+  otherwise_PConj = {s="përndryshe"} ;
+  therefore_PConj = {s="prandaj"} ;
+  please_Voc = {s="ju lutem"} ;
+  yes_Utt = {s="po"} ;
+  no_Utt = {s="jo"} ;
+  language_title_Utt = {s="shqip"} ;
+}

src/albanian/VerbSqi.gf

@@ -0,0 +1,150 @@
+concrete VerbSqi of Verb = CatSqi ** open Prelude, ParamX, ResSqi, (I=IrregSqi) in {
+
+oper
+  verbVP : Verb -> VP = \v -> lin VP {
+    indicative = \\t,n,p,_,_ => v.indicative ! t ! n ! p ;
+    subjunctive = \\n,p,_,_ => subjunctiveForm v.vtype
+      (v.indicative ! ResSqi.Pres ! Sg ! P1)
+      (v.indicative ! ResSqi.Pres ! n ! p) n p ;
+    imperative = \\n,_ => v.imperative ! n ;
+    participle = \\_,c => v.participle ;
+    pres_optative = \\n,p,c => v.pres_optative ! n ! p ;
+    perf_optative = \\n,p,c => v.perf_optative ! n ! p ;
+    pres_admirative = \\n,p,c => v.pres_admirative ! n ! p ;
+    imperf_admirative = \\n,p,c => v.imperf_admirative ! n ! p ;
+    vtype = v.vtype
+  } ;
+
+  addVP : VP -> (Agr => Case => Str) -> VP = \vp,x -> vp ** {
+    indicative = \\t,n,p,g,c => vp.indicative ! t ! n ! p ! g ! c ++
+      x ! {gn=genNum g n; p=p} ! c ;
+    subjunctive = \\n,p,g,c => vp.subjunctive ! n ! p ! g ! c ++
+      x ! {gn=genNum g n; p=p} ! c ;
+    imperative = \\n,c => vp.imperative ! n ! c ++
+      x ! {gn=genNum Masc n; p=P2} ! c ;
+    participle = \\a,c => vp.participle ! a ! c ++ x ! a ! c ;
+    pres_optative = \\n,p,c => vp.pres_optative ! n ! p ! c ++
+      x ! {gn=genNum Masc n; p=p} ! c ;
+    perf_optative = \\n,p,c => vp.perf_optative ! n ! p ! c ++
+      x ! {gn=genNum Masc n; p=p} ! c ;
+    pres_admirative = \\n,p,c => vp.pres_admirative ! n ! p ! c ++
+      x ! {gn=genNum Masc n; p=p} ! c ;
+    imperf_admirative = \\n,p,c => vp.imperf_admirative ! n ! p ! c ++
+      x ! {gn=genNum Masc n; p=p} ! c
+  } ;
+
+  slashVP : Verb -> Compl -> VPSlash = \v,c -> lin VPSlash {
+    indicative=\\t,n,p=>v.indicative!t!n!p;
+    subjunctive=\\n,p=>subjunctiveForm v.vtype
+      (v.indicative!ResSqi.Pres!Sg!P1)
+      (v.indicative!ResSqi.Pres!n!p) n p;
+    imperative=\\n=>v.imperative!n;
+    participle=v.participle;
+    pres_optative=v.pres_optative;
+    perf_optative=v.perf_optative;
+    pres_admirative=v.pres_admirative;
+    imperf_admirative=v.imperf_admirative;
+    c2=c;
+    vtype=v.vtype
+  } ;
+
+  addSlash : VPSlash -> Str -> VPSlash = \sl,x -> sl ** {
+    indicative = \\t,n,p => sl.indicative ! t ! n ! p ++ x ;
+    subjunctive = \\n,p => sl.subjunctive ! n ! p ++ x ;
+    imperative = \\n => sl.imperative ! n ++ x ;
+    participle = sl.participle ++ x ;
+    pres_optative = \\n,p => sl.pres_optative ! n ! p ++ x ;
+    perf_optative = \\n,p => sl.perf_optative ! n ! p ++ x ;
+    pres_admirative = \\n,p => sl.pres_admirative ! n ! p ++ x ;
+    imperf_admirative = \\n,p => sl.imperf_admirative ! n ! p ++ x
+  } ;
+
+  slashToVP : VPSlash -> VP = \v -> lin VP {
+    indicative = \\t,n,p,g,c => v.indicative ! t ! n ! p ;
+    subjunctive = \\n,p,_,_ => v.subjunctive ! n ! p ;
+    imperative = \\n,c => v.imperative ! n ;
+    participle = \\_,c => v.participle ;
+    pres_optative = \\n,p,c => v.pres_optative ! n ! p ;
+    perf_optative = \\n,p,c => v.perf_optative ! n ! p ;
+    pres_admirative = \\n,p,c => v.pres_admirative ! n ! p ;
+    imperf_admirative = \\n,p,c => v.imperf_admirative ! n ! p ;
+    vtype = v.vtype
+  } ;
+
+lin
+  UseV v = verbVP v ;
+  SlashV2a v = slashVP v v.c2 ;
+
+  ComplSlash v np = addVP (slashToVP v) (\\_,_ => v.c2.s ++ np.s ! v.c2.c) ;
+
+  ComplVS v s = addVP (verbVP v) (\\_,_ => "që" ++ s.s) ;
+  ComplVQ v q = addVP (verbVP v) (\\_,_ => q.s) ;
+  ComplVA v ap = addVP (verbVP v) (\\a,c =>
+    ap.s ! Indef ! c ! agrGender a ! agrNumber a) ;
+  ComplVV v vp = addVP (verbVP v) (\\a,_ =>
+    "të" ++ vp.subjunctive ! agrNumber a ! a.p ! agrGender a ! Nom) ;
+
+  Slash2V3 v np = addSlash (slashVP (lin Verb v) v.c3)
+    (v.c2.s ++ np.s ! v.c2.c) ;
+  Slash3V3 v np = addSlash (slashVP (lin Verb v) v.c2)
+    (v.c3.s ++ np.s ! v.c3.c) ;
+  SlashV2S v s = addSlash (slashVP (lin Verb v) v.c2) ("që" ++ s.s) ;
+  SlashV2Q v q = addSlash (slashVP (lin Verb v) v.c2) q.s ;
+  SlashV2A v ap = addSlash (slashVP (lin Verb v) v.c2)
+    (ap.s ! Indef ! Nom ! Masc ! Sg) ;
+  SlashV2V v vp = addSlash (slashVP (lin Verb v) v.c2)
+    ("të" ++ vp.subjunctive ! Sg ! P3 ! Masc ! Nom) ;
+  SlashVV v sl = sl ** {
+    indicative = \\t,n,p => v.indicative ! t ! n ! p ++ "të" ++ sl.subjunctive ! Sg ! P3 ;
+    subjunctive = \\n,p => subjunctiveForm v.vtype
+      (v.indicative!ResSqi.Pres!Sg!P1)
+      (v.indicative!ResSqi.Pres!n!p) n p ++ "të" ++ sl.subjunctive ! Sg ! P3
+  } ;
+  SlashV2VNP v np sl = sl ** {
+    indicative = \\t,n,p => v.indicative ! t ! n ! p ++ v.c2.s ++ np.s ! v.c2.c ++ "të" ++ sl.subjunctive ! Sg ! P3 ;
+    subjunctive = \\n,p => subjunctiveForm v.vtype
+      (v.indicative!ResSqi.Pres!Sg!P1)
+      (v.indicative!ResSqi.Pres!n!p) n p ++ v.c2.s ++ np.s ! v.c2.c ++ "të" ++ sl.subjunctive ! Sg ! P3
+  } ;
+
+  ReflVP sl = addVP (slashToVP sl) (\\_,_ => "veten") ;
+  UseComp comp = addVP (verbVP (lin Verb I.jam_V)) (\\a,_ => comp.s ! a) ;
+  UseCopula = verbVP (lin Verb I.jam_V) ;
+  PassV2 v = addVP (verbVP (lin Verb I.jam_V)) (\\_,_ => v.participle) ;
+
+  AdvVP vp adv = addVP vp (\\_,_ => adv.s) ;
+  ExtAdvVP vp adv = addVP vp (\\_,_ => SOFT_BIND ++ "," ++ adv.s) ;
+  AdVVP adv vp = vp ** {
+    indicative = \\t,n,p,g,c => adv.s ++ vp.indicative ! t ! n ! p ! g ! c ;
+    subjunctive = \\n,p,g,c => adv.s ++ vp.subjunctive ! n ! p ! g ! c ;
+    imperative = \\n,c => adv.s ++ vp.imperative ! n ! c
+  } ;
+  AdvVPSlash sl adv = sl ** {
+    indicative = \\t,n,p => sl.indicative ! t ! n ! p ++ adv.s ;
+    subjunctive = \\n,p => sl.subjunctive ! n ! p ++ adv.s ;
+    imperative = \\n => sl.imperative ! n ++ adv.s ;
+    participle = sl.participle ++ adv.s
+  } ;
+  AdVVPSlash adv sl = sl ** {
+    indicative = \\t,n,p => adv.s ++ sl.indicative ! t ! n ! p ;
+    subjunctive = \\n,p => adv.s ++ sl.subjunctive ! n ! p ;
+    imperative = \\n => adv.s ++ sl.imperative ! n
+  } ;
+  VPSlashPrep vp prep = lin VPSlash {
+    indicative = \\t,n,p => vp.indicative ! t ! n ! p ! Masc ! Nom ;
+    subjunctive = \\n,p => vp.subjunctive ! n ! p ! Masc ! Nom ;
+    imperative = \\n => vp.imperative ! n ! Nom ;
+    participle = vp.participle ! {gn=GSg Masc;p=P3} ! Nom ;
+    pres_optative = \\n,p => vp.pres_optative ! n ! p ! Nom ;
+    perf_optative = \\n,p => vp.perf_optative ! n ! p ! Nom ;
+    pres_admirative = \\n,p => vp.pres_admirative ! n ! p ! Nom ;
+    imperf_admirative = \\n,p => vp.imperf_admirative ! n ! p ! Nom ;
+    vtype = vp.vtype ;
+    c2 = prep
+  } ;
+
+  CompAP ap = {s = \\a => ap.s ! Indef ! Nom ! agrGender a ! agrNumber a} ;
+  CompNP np = {s = \\_ => np.s ! Nom} ;
+  CompAdv adv = {s = \\_ => adv.s} ;
+  CompCN cn = {s = \\_ => cn.s ! Indef ! Nom ! Sg} ;
+}

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/PatternsAmh.gf

@@ -128,10 +128,8 @@ C1eC2aC3 = {C1 ="" ; C1C2="'"; C2C3 ="!"; C3="#"};
 				peC1aC2C3 = { C1 = "ä" ; C1C2="'"; C2C3 ="'"; C3=""}; 
 				penC1aC2C3e = { C1 = "än" ; C1C2="'"; C2C3 ="'"; C3=""};
 				pteC1aC2C3 = { C1 = "t" ; C1C2="'"; C2C3 ="'"; C3=""};
-				pteC1aC2C3 = { C1 = "t" ; C1C2="'"; C2C3 ="'"; C3=""};-- 3
 				pteC1aC2C3u = { C1 = "t" ; C1C2="'"; C2C3 ="'"; C3="&"};
 				pyeC1aC2C3 = { C1 = "y" ; C1C2="'"; C2C3 ="'"; C3=""};
-				pteC1aC2C3 = { C1 = "t" ; C1C2="'"; C2C3 ="'"; C3=""};
 				pyeC1aC2C3u = { C1 = "y" ; C1C2="'"; C2C3 ="'"; C3="&"};
 
 				--Passive Jus_Imperat mkV3gdl
@@ -343,7 +341,6 @@ leC1AC2aC3 = {C1 ="l" ; C1C2="!"; C2C3 ="'"; C3=""};
 enC1AC2aC3 = { C1 = "(n" ; C1C2="!"; C2C3 ="'"; C3=""};
 C1AC2aC3 = { C1 = "" ; C1C2="!"; C2C3 ="'"; C3=""}; 
 C1AC2aC3i = { C1 = "" ; C1C2="!"; C2C3 ="'"; C3="#"}; 
-C1AC2aC3u = { C1 = "" ; C1C2="!"; C2C3 ="'"; C3="&"}; 
 yC1AC2aC3 = { C1 = "y" ; C1C2="!"; C2C3 ="'"; C3=""}; 
 tC1AC2aC3 = { C1 = "t" ; C1C2="!"; C2C3 ="'"; C3=""}; 
 yC1AC2aC3u = { C1 = "y" ; C1C2="!"; C2C3 ="'"; C3="&"};
@@ -661,7 +658,7 @@ C1AC2n = { C1 = "" ; C1C2="!"; C2 ="n"};
 C1AC2k = { C1 = "" ; C1C2="!"; C2 ="k"}; 
 C1AC2sh = { C1 = "" ; C1C2="!"; C2 ="x"}; 
 C1AC2achehu = { C1 = "" ; C1C2 ="!"; C2 ="!ch&"}; 
-C1AC2a = { C1 = "" ; C1C2="!"; C2 ="'"}; 
+C1AC2a = { C1 = "" ; C1C2="!"; C2 ="'"};
 C1AC2ach = { C1 = "" ; C1C2="!"; C2 ="'c"}; 
 C1AC2u = { C1 = "" ; C1C2="!"; C2 ="&"}; 
 -- Imper -- mkV2yz
@@ -701,7 +698,6 @@ C1C2ek = { C1 = "" ; C1C2=""; C2 ="'k"};
 C1C2esh = { C1 = "" ; C1C2=""; C2 ="'x"}; 
 C1C2achehu = { C1 = "" ; C1C2=""; C2 ="!ch&"}; 
 C1C2o = { C1 = "" ; C1C2=""; C2 ="/"}; 
-C1C2a = { C1 = "" ; C1C2=""; C2="!"}; 
 C1C2ew = { C1 = "" ; C1C2=""; C2="'w"};
 
 --CompPer mkV2yz  y!l'h& !l !l !l cX7l 7l l'c !l 
@@ -721,81 +717,12 @@ meC1aC2= {C1 ="m'" ; C1C2="!"; C2 =""};
 --Infinitve mkV2yz  
 C1aC2ii= {C1 ="" ; C1C2="!"; C2 ="#"};
 
-
-								--mkV2yz -- yz -- catch
-						--Perf -- 
-						C1AC2hu = {C1 ="" ; C1C2="!"; C2 ="h&"};
-						C1AC2n = { C1 = "" ; C1C2="!"; C2 ="n"};
-						C1AC2k = { C1 = "" ; C1C2="!"; C2 ="k"}; 
-						C1AC2sh = { C1 = "" ; C1C2="!"; C2 ="x"}; 
-						C1AC2achehu = { C1 = "" ; C1C2 ="!"; C2 ="!ch&"}; 
-						C1AC2a = { C1 = "" ; C1C2="!"; C2 ="'"}; 
-						C1AC2ach = { C1 = "" ; C1C2="!"; C2 ="'c"}; 
-						C1AC2u = { C1 = "" ; C1C2="!"; C2 ="&"}; 
-						-- Imper -- mkV2yz
-						eC1C2alehu = { C1 = "ä" ; C1C2=""; C2 ="!l'h&"}; 
-						enC1C2alen = { C1 = "än" ; C1C2=""; C2 ="!l'n"};
-						teC1C2yaleh = { C1 = "t" ; C1C2=""; C2 ="!l'h"};
-						teC1C2aleh = { C1 = "t" ; C1C2=""; C2 ="y!l'x"};
-						teC1C2alachehu = { C1 = "t" ; C1C2=""; C2 ="!l!ch&"};
-						yeC1C2al = { C1 = "y" ; C1C2=""; C2 ="!l"};
-						teC1C2alech = { C1 = "t" ; C1C2=""; C2 ="!l'c"};
-						yeC1C2alu = { C1 = "y" ; C1C2=""; C2 ="!l&"};
-
-						-- Cont -- mkV2yz
-						eC1C2 = { C1 = "ä" ; C1C2=""; C2 =""}; 
-						enC1C2 = { C1 = "än" ; C1C2=""; C2 =""};
-						teC1C2 = { C1 = "t" ; C1C2=""; C2 =""};
-						--teC1C2 = { C1 = "t" ; C1C2=""; C2 =""};3
-						teC1C2u = { C1 = "t" ; C1C2=""; C2 ="&"};
-						yeC1C2 = { C1 = "y" ; C1C2=""; C2 =""};
-						--teC1C2 = { C1 = "t" ; C1C2=""; C2 =""};
-						yeC1C2u = { C1 = "y" ; C1C2=""; C2 ="&"};
-
-
-						--Jus_Imperat mkV2yz
-						leC1aC2a = {C1 ="l" ; C1C2="!"; C2 =""};
-						enC1aC2a = { C1 = "än" ; C1C2="!"; C2 =""};
-						C1aC2 = { C1 = "" ; C1C2="!"; C2 =""}; 
-						C1aC2i = { C1 = "" ; C1C2="!"; C2 ="#"}; 
-						C1eC2u = { C1 = "" ; C1C2="!"; C2 ="&"}; 
-						yC1aC2a = { C1 = "y" ; C1C2="!"; C2 =""}; 
-						tC1aC2a = { C1 = "t" ; C1C2="!"; C2 =""}; 
-						yC1aC2u = { C1 = "y" ; C1C2="!"; C2 ="&"}; 
-						--Gerund mkV2yz
-						C1C2ie = {C1 ="" ; C1C2=""; C2 ="%"};
-						C1C2en = { C1 = "" ; C1C2=""; C2 ="'n"};
-						C1C2ek = { C1 = "" ; C1C2=""; C2 ="'k"}; 
-						C1C2esh = { C1 = "" ; C1C2=""; C2 ="'x"}; 
-						C1C2achehu = { C1 = "" ; C1C2=""; C2 ="!ch&"}; 
-						C1C2o = { C1 = "" ; C1C2=""; C2 ="/"}; 
-						C1C2a = { C1 = "" ; C1C2=""; C2="!"}; 
-						C1C2ew = { C1 = "" ; C1C2=""; C2="'w"};
-
-						--CompPer mkV2yz  y!l'h& !l !l !l cX7l 7l l'c !l 
-						C1C2iealehu = {C1 ="" ; C1C2=""; C2 ="%y!l'h&"};
-						C1C2enal = { C1 = "" ; C1C2=""; C2 ="'n!l"};
-						C1C2ekal = { C1 = "" ; C1C2=""; C2 ="'k!l"}; 
-						C1C2eshal = { C1 = "" ; C1C2=""; C2 ="'x!l"}; 
-						C1C2achehual = { C1 = "" ; C1C2=""; C2 ="!cX7l"}; 
-						C1C2oal = { C1 = "" ; C1C2=""; C2 ="7l"}; 
-						C1C2alech = { C1 = "" ; C1C2=""; C2="!l'c"}; 
-						C1C2ewal = { C1 = "" ; C1C2=""; C2="'w!l"};
-
-						 
-						--Infinitve mkV2yz  
-						meC1aC2= {C1 ="m'" ; C1C2="!"; C2 =""};
-
-						--Infinitve mkV2yz  
-						C1aC2ii= {C1 ="" ; C1C2="!"; C2 ="#"};
-
 --nore -- nr -- live
 --Perf -- 
 C1oC2hu = {C1 ="" ; C1C2="/"; C2 ="h&"};
 C1oC2n = { C1 = "" ; C1C2="/"; C2 ="n"};
 C1oC2k = { C1 = "" ; C1C2="/"; C2 ="k"}; 
 C1oC2sh = { C1 = "" ; C1C2="/"; C2 ="x"}; 
-C1oC2achehu = { C1 = "" ; C1C2 ="/"; C2 ="!ch&"}; 
 C1oC2a = { C1 = "" ; C1C2="/"; C2 ="'"}; 
 C1oC2ach = { C1 = "" ; C1C2="/"; C2 ="'c"}; 
 C1oC2u = { C1 = "" ; C1C2="/"; C2 ="&"}; 
@@ -858,87 +785,12 @@ meC1oC2= {C1 ="m'" ; C1C2="/"; C2 =""};
 C1uaC2i= {C1 ="" ; C1C2="7"; C2 ="#"};
 
 
-
-
-								--nore -- nr -- live
-						--Perf -- 
-						C1oC2hu = {C1 ="" ; C1C2="/"; C2 ="h&"};
-						C1oC2n = { C1 = "" ; C1C2="/"; C2 ="n"};
-						C1oC2k = { C1 = "" ; C1C2="/"; C2 ="k"}; 
-						C1oC2sh = { C1 = "" ; C1C2="/"; C2 ="x"}; 
-						C1oC2achehu = { C1 = "" ; C1C2 ="/"; C2 ="!ch&"}; 
-						C1oC2a = { C1 = "" ; C1C2="/"; C2 ="'"}; 
-						C1oC2ach = { C1 = "" ; C1C2="/"; C2 ="'c"}; 
-						C1oC2u = { C1 = "" ; C1C2="/"; C2 ="&"}; 
-						-- Imper -- mkV2nr
-						eC1oC2alehu = { C1 = "ä" ; C1C2="/"; C2 ="!l'h&"}; 
-						enC1oC2alen = { C1 = "än" ; C1C2="/"; C2 ="!l'n"};
-						teC1oC2yaleh = { C1 = "t" ; C1C2="/"; C2 ="!l'h"};
-						teC1oC2alesh = { C1 = "t" ; C1C2="/"; C2 ="y!l'x"};
-						teC1oC2alachehu = { C1 = "t" ; C1C2="/"; C2 ="!l!ch&"};
-						yeC1oC2al = { C1 = "y" ; C1C2="/"; C2 ="!l"};
-						teC1oC2alech = { C1 = "t" ; C1C2="/"; C2 ="!l'c"};
-						yeC1oC2alu = { C1 = "y" ; C1C2="/"; C2 ="!l&"};
-
-						-- Imper -- mkV2nr
-						eC1oC2 = { C1 = "ä" ; C1C2="/"; C2 =""}; 
-						enC1oC2 = { C1 = "än" ; C1C2="/"; C2 =""};
-						teC1oC2 = { C1 = "t" ; C1C2="/"; C2 =""};
-						teC1oC2i = { C1 = "t" ; C1C2="/"; C2 ="#"};
-						teC1oC2u = { C1 = "t" ; C1C2="/"; C2 ="&"};
-						yeC1oC2 = { C1 = "y" ; C1C2="/"; C2 =""};
-						--teC1oC2 = { C1 = "t" ; C1C2="/"; C2 ="!l'c"};
-						yeC1oC2u = { C1 = "y" ; C1C2="/"; C2 ="&"};
-
-						--Jus_Imperat mkV2nr
-						leC1uC2 = {C1 ="l" ; C1C2="&"; C2 =""};
-						enC1uC2 = { C1 = "än" ; C1C2="&"; C2 =""};
-						C1uC2 = { C1 = "" ; C1C2="&"; C2 =""}; 
-						C1uC2i = { C1 = "" ; C1C2="&"; C2 ="#"}; 
-						C1uC2u = { C1 = "" ; C1C2="&"; C2 ="&"}; 
-						yC1uC2 = { C1 = "y" ; C1C2="&"; C2 =""}; 
-						tC1uC2 = { C1 = "t" ; C1C2="&"; C2 =""}; 
-						yC1uC2u = { C1 = "y" ; C1C2="&"; C2 ="&"}; 
-
-
-
-						--Gerund mkV2nr
-						C1oC2ie = {C1 ="" ; C1C2="/"; C2 ="%"};
-						C1oC2en = { C1 = "" ; C1C2="/"; C2 ="'n"};
-						C1oC2ek = { C1 = "" ; C1C2="/"; C2 ="'k"}; 
-						C1oC2esh = { C1 = "" ; C1C2="/"; C2 ="'x"}; 
-						C1oC2achehu = { C1 = "" ; C1C2="/"; C2 ="!ch&"}; 
-						C1oC2o = { C1 = "" ; C1C2="/"; C2 ="/"}; 
-						C1oC2A = { C1 = "" ; C1C2="/"; C2="!"}; 
-						C1oC2ew = { C1 = "" ; C1C2="/"; C2="'w"}; 
-
-						--CompPer mkV2nr y!l'h& !l !l !l cX7l 7l l'c !l
-						C1oC2iealehu = {C1 ="" ; C1C2="/"; C2 ="%y!l'h& "};
-						C1oC2enal = { C1 = "" ; C1C2="/"; C2 ="'n!l"};
-						C1oC2ekal = { C1 = "" ; C1C2="/"; C2 ="'k!l"}; 
-						C1oC2eshal = { C1 = "" ; C1C2="/"; C2 ="'x!l"}; 
-						C1oC2achehual = { C1 = "" ; C1C2="/"; C2 ="!cX7l"}; 
-						C1oC2oal = { C1 = "" ; C1C2="/"; C2 ="7l"}; 
-						C1oC2Alech = { C1 = "" ; C1C2="/"; C2="!l'c"}; 
-						C1oC2ewal = { C1 = "" ; C1C2="/"; C2="'w!l"};
-
-						--Infinitve mkV2nr
-						meC1oC2= {C1 ="m'" ; C1C2="/"; C2 =""};
-
-						--Participle mkV2nr
-						C1uaC2i= {C1 ="" ; C1C2="7"; C2 ="#"};
-
-
 --mkV2wN -- wN -- swim --- Eg lie, see, say
 --Perf -- 
 C1AC2ehu = {C1 ="" ; C1C2="!"; C2 ="'h&"};
 C1AC2en = { C1 = "" ; C1C2="!"; C2 ="'n"};
 C1AC2ek = { C1 = "" ; C1C2="!"; C2 ="'k"}; 
 C1AC2esh = { C1 = "" ; C1C2="!"; C2 ="'x"}; 
---C1AC2achehu = { C1 = "" ; C1C2 ="!"; C2 ="!ch&"}; 
---C1AC2a = { C1 = "" ; C1C2="!"; C2 ="'"}; 
---C1AC2ach = { C1 = "" ; C1C2="!"; C2 ="'c"}; 
---C1AC2u = { C1 = "" ; C1C2="!"; C2 ="&"}; 
 -- Imper -- mkV2wN
 eC1aC2alehu = { C1 = "ä" ; C1C2="!"; C2 ="!l'h&"}; 
 enC1aC2alen = { C1 = "än" ; C1C2="!"; C2 ="!l'n"};
@@ -992,74 +844,6 @@ C1aC2tewal = { C1 = "" ; C1C2="!"; C2="t'w!l"};
 meC1aC2et= {C1 ="m'" ; C1C2="!"; C2 ="'t"};
 --nore -- nr -- live
 
-
-		
-								--mkV2wN -- wN -- swim --- Eg lie, see, say
-					--Perf -- 
-					C1AC2ehu = {C1 ="" ; C1C2="!"; C2 ="'h&"};
-					C1AC2en = { C1 = "" ; C1C2="!"; C2 ="'n"};
-					C1AC2ek = { C1 = "" ; C1C2="!"; C2 ="'k"}; 
-					C1AC2esh = { C1 = "" ; C1C2="!"; C2 ="'x"}; 
-					--C1AC2achehu = { C1 = "" ; C1C2 ="!"; C2 ="!ch&"}; 
-					--C1AC2a = { C1 = "" ; C1C2="!"; C2 ="'"}; 
-					--C1AC2ach = { C1 = "" ; C1C2="!"; C2 ="'c"}; 
-					--C1AC2u = { C1 = "" ; C1C2="!"; C2 ="&"}; 
-					-- Imper -- mkV2wN
-					eC1aC2alehu = { C1 = "ä" ; C1C2="!"; C2 ="!l'h&"}; 
-					enC1aC2alen = { C1 = "än" ; C1C2="!"; C2 ="!l'n"};
-					teC1aC2yaleh = { C1 = "t" ; C1C2="!"; C2 ="!l'h"};
-					teC1aC2alesh = { C1 = "t" ; C1C2="!"; C2 ="y!l'x"};
-					teC1aC2alachehu = { C1 = "t" ; C1C2="!"; C2 ="!l!ch&"};
-					yeC1aC2al = { C1 = "y" ; C1C2="!"; C2 ="!l"};
-					teC1aC2alech = { C1 = "t" ; C1C2="!"; C2 ="!l'c"};
-					yeC1aC2alu = { C1 = "y" ; C1C2="!"; C2 ="!l&"};
-
-					-- Cont -- mkV2wN
-					eC1aC2 = { C1 = "ä" ; C1C2="!"; C2 =""}; 
-					enC1aC2 = { C1 = "än" ; C1C2="!"; C2 =""};
-					teC1aC2 = { C1 = "t" ; C1C2="!"; C2 =""};
-					--teC1aC2 = { C1 = "t" ; C1C2="!"; C2 =""};
-					teC1aC2u = { C1 = "t" ; C1C2="!"; C2 ="&"};
-					yeC1aC2 = { C1 = "y" ; C1C2="!"; C2 =""};
-					--teC1aC2 = { C1 = "t" ; C1C2="!"; C2 =""};
-					yeC1aC2u = { C1 = "y" ; C1C2="!"; C2 ="&"};
-
-					--Jus_Imperat mkV2wN
-					--leC1aC2a = {C1 ="l" ; C1C2="!"; C2 =""};
-					--enC1aC2a = { C1 = "än" ; C1C2="!"; C2 =""};
-					--C1aC2 = { C1 = "" ; C1C2="!"; C2 =""}; 
-					--C1aC2i = { C1 = "" ; C1C2="!"; C2 ="#"}; 
-					--C1eC2u = { C1 = "" ; C1C2="!"; C2 ="&"}; 
-					--yC1aC2a = { C1 = "y" ; C1C2="!"; C2 =""}; 
-					--tC1aC2a = { C1 = "t" ; C1C2="!"; C2 =""}; 
-					--yC1aC2u = { C1 = "y" ; C1C2="!"; C2 ="&"}; 
-					--Gerund mkV2wN
-					C1aC2cie = {C1 ="" ; C1C2="!"; C2 ="c%"};
-					C1aC2ten = { C1 = "" ; C1C2="!"; C2 ="t'n"};
-					C1aC2tek = { C1 = "" ; C1C2="!"; C2 ="t'k"}; 
-					C1aC2tesh = { C1 = "" ; C1C2="!"; C2 ="t'x"}; 
-					C1aC2tachehu = { C1 = "" ; C1C2="!"; C2 ="t!ch&"}; 
-					C1aC2to = { C1 = "" ; C1C2="!"; C2 ="t/"}; 
-					C1aC2ta = { C1 = "" ; C1C2="!"; C2="t!"}; 
-					C1aC2tew = { C1 = "" ; C1C2="!"; C2="t'w"}; 
-
-					--ComPer mkV2wN  y!l'h& !l !l !l cX7l 7l l'c !l 
-					C1aC2ciealehu = {C1 ="" ; C1C2="!"; C2 ="c%y!l'h&"};
-					C1aC2tenal = { C1 = "" ; C1C2="!"; C2 ="t'n!l"};
-					C1aC2tekal = { C1 = "" ; C1C2="!"; C2 ="t'k!l"}; 
-					C1aC2teshal = { C1 = "" ; C1C2="!"; C2 ="t'x!l"}; 
-					C1aC2tachehual = { C1 = "" ; C1C2="!"; C2 ="t!cX7l"}; 
-					C1aC2toal = { C1 = "" ; C1C2="!"; C2 ="t7l"}; 
-					C1aC2talech = { C1 = "" ; C1C2="!"; C2="t!l'c"}; 
-					C1aC2tewal = { C1 = "" ; C1C2="!"; C2="t'w!l"}; 
-
-					--Infinitve mkV2wN
-					meC1aC2et= {C1 ="m'" ; C1C2="!"; C2 ="'t"};
-					--nore -- nr -- live
-	
-
-
-
 ----------- This much is enough for the duo-radicals--- 
 --There are few verbs still remaining like the case of shete, hede , --washe, aye, ale , all need unique froms for them selves. I will get --back here later!! 
 
@@ -1109,63 +893,8 @@ tC1eC2 = { C1 = "t" ; C1C2=""; C2 =""};
 meC1C2et= {C1 ="m'" ; C1C2=""; C2 ="'t"};
 
 
-
-
-
-				----------- This much is enough for the duo-radicals--- 
-				--There are few verbs still remaining like the case of shete, hede , --washe, aye, ale , all need unique froms for them selves. I will get --back here later!! 
-
-				--seTe -- st -- give
-				--Perf -- 
-				C1eC2hu = {C1 ="" ; C1C2="'"; C2 ="'h&"};
-				C1eC2n = { C1 = "" ; C1C2="'"; C2 ="'n"};
-				C1eC2k = { C1 = "" ; C1C2="'"; C2 ="'k"}; 
-				C1eC2sh = { C1 = "" ; C1C2="'"; C2 ="'x"}; 
-				C1eC2achehu = { C1 = "" ; C1C2 ="'"; C2 ="'ch&"}; 
-				C1eC2a = { C1 = "" ; C1C2="'"; C2 ="'"}; 
-				C1eC2ach = { C1 = "" ; C1C2="'"; C2 ="'c"}; 
-				--C1eC2u = { C1 = "" ; C1C2="'"; C2 ="&"}; same as C1aC2u (bela) 
-				-- Imper -- mkV2sT
-				--eC1eC2alehu = { C1 = "ä" ; C1C2="'"; C2 ="!l'h&"}; eC1aC2alehu
-				--enC1eC2alen = { C1 = "än" ; C1C2="'"; C2 ="!l'n"};enC1aC2alen
-				--teC1eC2yaleh = { C1 = "t" ; C1C2="'"; C2 ="!l'h"};teC1aC2yaleh
-				--teC1eC2aleh = { C1 = "t" ; C1C2="'"; C2 ="y!l'x"};teC1aC2aleh 
-				--teC1eC2alachehu = { C1 = "t" ; C1C2="'"; C2 ="!l!ch&"};teC1aC2alachehu
-				--yeC1eC2al = { C1 = "y" ; C1C2="'"; C2 ="!l"};yeC1aC2al 
-				--teC1eC2alech = { C1 = "t" ; C1C2="'"; C2 ="!l'c"};teC1aC2alech 
-				--yeC1eC2alu = { C1 = "y" ; C1C2="'"; C2 ="!l&"};yeC1aC2alu
-
-				--Jus_Imperat mkV2sT
-
-				leC1eC2 = {C1 ="l" ; C1C2=""; C2 =""};
-				enC1eC2 = { C1 = "än" ; C1C2=""; C2 =""};
-				C1C2 = { C1 = "" ; C1C2=""; C2 =""}; 
-				C1eC2i = { C1 = "" ; C1C2=""; C2 ="#"}; 
-				--C1eC2u = { C1 = "" ; C1C2=""; C2 ="&"}; C1C2u 
-				yC1eC2 = { C1 = "y" ; C1C2=""; C2 =""}; 
-				tC1eC2 = { C1 = "t" ; C1C2=""; C2 =""}; 
-				--yC1eC2u = { C1 = "y" ; C1C2=""; C2 ="&"};yC1C2u 
-
-
-				--Gerund mkV2sT
-
-				--C1eC2ie = {C1 ="" ; C1C2="'"; C2 ="c%"}; C1aC2cie
-				--C1eC2en = { C1 = "" ; C1C2="'"; C2 ="'n"};C1aC2ten 
-				--C1eC2ek = { C1 = "" ; C1C2="'"; C2 ="'k"}; C1aC2tek
-				--C1eC2esh = { C1 = "" ; C1C2="'"; C2 ="'x"}; C1aC2tesh
-				--C1eC2achehu = { C1 = "" ; C1C2="'"; C2 ="!ch&"};C1aC2tachehu  
-				--C1eC2o = { C1 = "" ; C1C2="'"; C2 ="/"};C1aC2to
-				--C1eC2A = { C1 = "" ; C1C2="'"; C2="!"};C1aC2ta
-				--C1eC2ew = { C1 = "" ; C1C2="'"; C2="'w"}; C1aC2tew
-				--Infinitve mkV2sT
-				meC1C2et= {C1 ="m'" ; C1C2=""; C2 ="'t"};
-
-
-
-
 ---- Quadro_Radical
 
-
 --Starting with type Tri-Radical Roots
 --	 Eg. dbdb  - fight
 --           qzqz  - freeze
@@ -1238,152 +967,4 @@ meC1aC2C3aC4 = {C1 ="m'" ; C1C2="'"; C2C3 =""; C3C4="'"; C4= "" };
 --Participle mkV4dbdb 
 C1eC2C3aC4i = {C1 ="" ; C1C2="'"; C2C3 =""; C3C4="!"; C4= "#" };
 
-
-								---- Quadro_Radical
-
-
-					--Starting with type Tri-Radical Roots
-					--	 Eg. dbdb  - fight
-					--           qzqz  - freeze
-					--            wrwr  - throw 
-					--             tnfs  - breath
-
-					--Perf -- 
-					C1aC2aC3aC4hu = {C1 ="" ; C1C2="'"; C2C3 ="'"; C3C4="'"; C4= "h&" };
-					C1aC2aC3aC4n = { C1 = "" ; C1C2="'"; C2C3 ="'"; C3C4="'"; C4= "n" };
-					C1aC2aC3aC4k = { C1 = "" ; C1C2="'"; C2C3 ="'"; C3C4="'"; C4= "k" }; 
-					C1aC2aC3aC4sh = { C1 = "" ; C1C2="'"; C2C3 ="'"; C3C4="'"; C4= "x" }; 
-					C1aC2aC3aC4achehu = { C1 = "" ; C1C2="'"; C2C3 ="'"; C3C4="'"; C4= "!ch&" }; 
-					C1aC2aC3aC4a = { C1 = "" ; C1C2="'"; C2C3 ="'"; C3C4="'"; C4= "'" }; 
-					C1aC2aC3aC4ech = { C1 = "" ; C1C2="'"; C2C3 ="'"; C3C4="'"; C4= "'c" }; 
-					C1aC2aC3aC4u = { C1 = "" ; C1C2="'"; C2C3 ="'"; C3C4="'"; C4= "&" }; 
-					--Imper --mkV4dbdb 
-					eC1aC2aC3C4alehu = { C1 = "ä" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "!l'h&" }; 
-					enC1aC2aC3C4alen = { C1 = "än" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "!l'n" };
-					teC1aC2aC3C4yaleh = { C1 = "t" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "!l'h" };
-					teC1aC2aC3C4aleh = { C1 = "t" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "y!l'x" };
-					teC1aC2aC3C4alachehu = { C1 = "t" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "!l!ch&" };
-					yeC1aC2aC3C4al = { C1 = "y" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "!l" };
-					teC1aC2aC3C4alech = { C1 = "t" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "!l'c" };
-					yeC1aC2aC3C4alu = { C1 = "y" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "!l&" };
-
-					--Cont --mkV4dbdb 
-					eC1aC2aC3C4 = { C1 = "ä" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "" }; 
-					enC1aC2aC3C4 = { C1 = "än" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "" };
-					teC1aC2aC3C4 = { C1 = "t" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "" };
-					teC1aC2aC3C4i = { C1 = "t" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "#" };
-					teC1aC2aC3C4u = { C1 = "t" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "&" };
-					yeC1aC2aC3C4 = { C1 = "y" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "" };
-					--teC1aC2aC3C4 = { C1 = "t" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "" };
-					yeC1aC2aC3C4u = { C1 = "y" ; C1C2="'"; C2C3 ="'"; C3C4=""; C4= "&" };
-
-
-
-					--Jus_Imperat mkV4dbdb 
-					leC1aC2C3C4 = {C1 ="l" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "" };
-					enC1aC2C3C4 = { C1 = "än" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "" };
-					C1aC2C3C4 = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "" }; 
-					C1aC2C3C4i = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "#" }; 
-					C1aC2C3C4u = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "&" }; 
-					yC1aC2C3C4 = { C1 = "y" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "" }; 
-					tC1aC2C3C4 = { C1 = "t" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "" }; 
-					yC1aC2C3C4u = { C1 = "y" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "&" }; 
-					--Gerund mkV4dbdb 
-					C1aC2C3C4ie = {C1 ="" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "%" };
-					C1aC2C3C4en = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "'n" };
-					C1aC2C3C4ek = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "'k" }; 
-					C1aC2C3C4esh = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "'x" }; 
-					C1aC2C3C4achehu = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "!ch&" }; 
-					C1aC2C3C4o = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "/" }; 
-					C1aC2C3C4a = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "!" }; 
-					C1aC2C3C4ew = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "'w" }; 
-
-					--CompPerf mkV4dbdb y!l'h& !l !l !l cX7l 7l l'c !l  
-					C1aC2C3C4iealehu = {C1 ="" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "%y!l'h&" };
-					C1aC2C3C4enal = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "'n!l" };
-					C1aC2C3C4ekal = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "'k!l" }; 
-					C1aC2C3C4eshal = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "'x!l" }; 
-					C1aC2C3C4achehual = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "!cX7l" }; 
-					C1aC2C3C4oal = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "7l" }; 
-					C1aC2C3C4alech = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "!l'c" }; 
-					C1aC2C3C4ewal = { C1 = "" ; C1C2="'"; C2C3 =""; C3C4=""; C4= "'w!l" }; 
-
-					--Infinitve mkV4dbdb 
-					meC1aC2C3aC4 = {C1 ="m'" ; C1C2="'"; C2C3 =""; C3C4="'"; C4= "" };
-
-					--Participle mkV4dbdb 
-					C1eC2C3aC4i = {C1 ="" ; C1C2="'"; C2C3 =""; C3C4="!"; C4= "#" };
-
-
 }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-{-
-resource PatternsAmh =  {
-
-flags coding=utf8 ;
-
- oper
---perf
-C1aC2aC3ku = {C1 ="" ; C1C2="ኧ"; C2C3 ="ኧ"; C3="ኩ"};
-C1aC2aC3n = { C1 = "" ; C1C2="ኧ"; C2C3 ="ኧ"; C3="ን"};
-C1aC2aC3k = { C1 = "" ; C1C2="ኧ"; C2C3 ="ኧ"; C3="ክ"}; 
-C1aC2aC3sh = { C1 = "" ; C1C2="ኧ"; C2C3 ="ኧ"; C3="ሽ"}; 
-C1aC2aC3achehu = { C1 = "" ; C1C2="ኧ"; C2C3 ="ኧ"; C3="አችሁ"}; 
-C1aC2aC3e = { C1 = "" ; C1C2="ኧ"; C2C3 ="ኧ"; C3="ኧ"}; 
-C1aC2aC3ech = { C1 = "" ; C1C2="ኧ"; C2C3 ="ኧ"; C3="ኧች"}; 
-C1aC2aC3u = { C1 = "" ; C1C2="ኧ"; C2C3 ="ኧ"; C3="ኡ"}; 
-
---imper
-eC1aC2C3alehu = { C1 = "እ" ; C1C2="ኧ"; C2C3 =""; C3="አለሁ"}; 
-enC1aC2C3alen = { C1 = "እን" ; C1C2="ኧ"; C2C3 =""; C3="አለን"};
-teC1aC2C3yaleh = { C1 = "ት" ; C1C2="ኧ"; C2C3 =""; C3="አለህ"};
-teC1aC2C3aleh = { C1 = "ት" ; C1C2="ኧ"; C2C3 =""; C3="ያለሽ"};
-teC1aC2C3alachehu = { C1 = "ት" ; C1C2="ኧ"; C2C3 =""; C3="አላችሁ"};
-yeC1aC2C3al = { C1 = "ይ" ; C1C2="ኧ"; C2C3 =""; C3="አል"};
-teC1aC2C3alech = { C1 = "ት" ; C1C2="ኧ"; C2C3 =""; C3="አለች"};
-yeC1aC2C3alu = { C1 = "ይ" ; C1C2="ኧ"; C2C3 =""; C3="አሉ"};
-
-
-}
--}
-
-
-
-
-

src/amharic/PhraseAmh.gf

@@ -22,12 +22,9 @@ concrete PhraseAmh of Phrase = CatAmh ** open
 	UttIP ip = ip ; --- Acc also
 	UttVP vp = {s = vp.obj.s ++ vp.inf} ;
 	UttIAdv iadv = iadv ;
-	UttCN n = {s = n.s ! Sg ! Indef!Nom} ;
-    	UttCard n = {s = n.s ! Masc!Sg!Indef!Nom} ;
 	UttImpSg pol imp = {s = pol.s ++ imp.s!pol.p!Masc!Sg};
 	UttImpPl pol imp = {s = pol.s ++ imp.s ! pol.p! Masc! Pl} ; --- TO DO 
 	UttImpPol pol imp = {s = pol.s ++ imp.s ! pol.p ! Masc!Pl} ; -- TO DO --- 
-	UttQS qs = {s = qs.s } ; -- TO DO 
     {-  
     
     PConjConj conj = {s = conj.s2} ; ---

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/TryMlt.gf

@@ -1,6 +1,6 @@
 --# -path=.:../maltese:../common:../abstract:../prelude
 
-resource TryMlt = SyntaxMlt, LexiconMlt, ParadigmsMlt - [mkAdN, mkAdv,mkOrd,mkQuant] ** 
+resource TryMlt = SyntaxMlt, LexiconMlt, ParadigmsMlt - [mkAdN, mkAdv,mkCard,mkDet,mkIAdv,mkIDet,mkOrd,mkPConj,mkQuant,mkVoc] **
   open (P = ParadigmsMlt) in {
 
 }

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

@@ -4,11 +4,11 @@ concrete ExtendAra of Extend =
   CatAra ** ExtendFunctor - [
     GenNP, ApposNP, ICompAP, DetNPMasc, DetNPFem,
     EmptyRelSlash, PredAPVP,
-    ComplDirectVS, ComplDirectVQ, -- because of Utt
+    ComplDirectVS, ComplDirectVQ, UttAdV, -- because of Utt
     VPS, MkVPS, PredVPS, BaseVPS, ConsVPS, ConjVPS,
     EmbedSSlash, AdjAsNP, GerundNP,
     PassVPSlash, ---- bogus implementation, see below
-    CompoundN
+    CompoundN, UseDAP, UseDAPMasc, UseDAPFem
 ]
   with (Grammar=GrammarAra)
   ** open
@@ -31,6 +31,8 @@ lin
   -- : NP -> NP -> NP
   ApposNP np1 np2 = np2 ** {s = \\c => np1.s ! c ++ np2.s ! c} ;
 
+  UttAdV adv = {s = \\_ => adv.s} ;
+
   -- : AP -> IComp ;   -- "how old"
   ICompAP ap = {s = \\gn => "كَمْ" ++ ap.s ! NoHum ! gn.g ! gn.n ! Indef ! Acc} ;
 
@@ -105,4 +107,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
 
@@ -502,17 +504,17 @@ oper
       AComp d c => comp ! Sg ! d ! c
       }
    } ;
-	
+
   mascFemCompAdj : (kabir, kabira, akbar : Str) -> Adj =
     \kabir, kabira, akbar ->
     ntablesAdj (positAdj kabir ! Masc) (positAdj kabir ! Fem) (positAdj akbar ! Masc) ;
-  
+
   mascFemAdj : (kabir, kabira : Str) -> Adj = \kabir, kabira ->
     mascFemCompAdj kabir kabira kabir ; ---- comp
 
   mascAdj : (kabir : Str) -> Adj = \kabir ->
     mascFemAdj kabir (kabir + "َة") ;
-    
+
 
 -----------------------------------------------------------------------------
 -----------------------------------------------------------------------------

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)) ;
 
 
 
@@ -904,7 +916,7 @@ oper
     wmkN : {sg, pl : Str ; g : Gender} -> N
       = \r -> mkN r.sg r.pl r.g nohum ;  --- hum/nohum not in Wikt
     wmkN : {sg : Str} -> N
-      = \r -> smartN r.sg ; 
+      = \r -> smartN r.sg ;
     wmkN : {sg : Str ; g : Gender ; root : Str} -> N
       = \r -> smartN r.sg ** {g = r.g} ; ----
     wmkN : {sg : Str; g : Gender} -> N
@@ -914,8 +926,8 @@ oper
     wmkN : {sg : Str; pl : Str} -> N
       = \r -> mkN r.sg r.pl masc nohum ; ---- ** {g = (smartN r.sg).g} ;
     wmkN : {sg, pl : Str ; root : Str} -> N
-      = \r -> mkN r.sg r.pl masc nohum ;  ---- 
-    wmkN : {sg : Str; root : Str} -> N 
+      = \r -> mkN r.sg r.pl masc nohum ;  ----
+    wmkN : {sg : Str; root : Str} -> N
       = \r -> smartN r.sg ;
     } ;
 
@@ -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,19 @@
+concrete AdjectiveHye of Adjective = CatHye ** open ResHye, Prelude in {
+lin
+  AdAP ada ap = {
+    s = \\sp,c,num => ada.s ++ ap.s ! sp ! c ! num;
+    isPre = ap.isPre
+  } ;
+  PositA a = {
+    s = \\sp,c,num =>
+            case <sp,c> of {
+              <Def,Nom> => a.def_nom ! num ;
+              <Def,Dat> => a.def_dat ! num ;
+              <Poss P1,_> => a.poss1 ! c ! num ;
+              <Poss P2,_> => a.poss2 ! c ! num ;
+              _         => a.s ! c ! num
+            } ;
+    isPre = True
+  } ;
+
+}

src/armenian/AdverbHye.gf

@@ -0,0 +1,6 @@
+concrete AdverbHye of Adverb = CatHye ** open Prelude,ResHye in {
+  lin PrepNP p np = {s = case p.isPre of {
+                           False => np.s ! p.c ++ p.s;
+                           True  => p.s ++ np.s ! p.c
+                         }} ;
+}

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,63 @@
+concrete CatHye of Cat = CommonX ** open Prelude,ResHye in {
+  lincat A = Adj ;
+  lincat A2 = Adj ** {c2 : Compl} ;
+  lincat ACard = {s : Str} ;
+  lincat AP = {s : Species => Case => Number => Str; isPre : Bool} ;
+  lincat CN = {s : Species => Case => Number => Str} ;
+  lincat Card = {s : Str} ;
+  lincat Cl = {s : Str;
+               conditional : Aspect => Number => Str;
+               converb : {imperfective : Str; futCon1 : Str;
+                          futCon2 : Str; negative : Str;
+                          perfective : Str; simultaneous : Str};
+               passive : Str; past : Person => Number => Str;
+               participle : PartType => Str;
+               subjunctive : Aspect => Number => Str} ;
+  lincat ClSlash = {s : Str} ;
+  lincat Comp = {s : Str} ;
+  lincat Conj = {s : Str} ;
+  lincat DAP = {s : Str} ;
+  lincat Decimal = {s : Str} ;
+  lincat Det = {s : Str; n : Number; sp : Species} ;
+  lincat Digits = {s : Str} ;
+  lincat GN = {s : Str} ;
+  lincat IComp = {s : Str} ;
+  lincat IDet = {s : Str} ;
+  lincat IP = {s : Str} ;
+  lincat IQuant = {s : Str} ;
+  lincat Imp = {s : Str} ;
+  lincat LN = {s : Str} ;
+  lincat N = Noun ;
+  lincat N2 = Noun ** {c2 : Compl} ;
+  lincat N3 = Noun ** {c2,c3 : Compl} ;
+  lincat NP = {s : Case => Str; a : Agr} ;
+  lincat Num = {s : Str; n : Number} ;
+  lincat Numeral = {s : Str} ;
+  lincat Ord = {s : Str} ;
+  lincat PN = {s : Str} ;
+  lincat Predet = {s : Str} ;
+  lincat Prep = Compl ** {isPre : Bool} ;
+  lincat Pron = {s : Str; empty : Str; a : Agr} ;
+  lincat QCl = {s : Str} ;
+  lincat QS = {s : Str} ;
+  lincat Quant = {s : Str; sp : Species} ;
+  lincat RCl = {s : Str} ;
+  lincat RP = {s : Str} ;
+  lincat RS = {s : Str} ;
+  lincat S = {s : Str} ;
+  lincat SN = {s : Str} ;
+  lincat SSlash = {s : Str} ;
+  lincat Subj = {s : Str} ;
+  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 VP = {s : Str;
+               conditional : Aspect => Person => Number => Str;
+               converb : {imperfective : Str; futCon1 : Str; futCon2 : Str;
+                          negative : Str; perfective : Str; simultaneous : Str};
+               imperative : Number => Str; passive : Str;
+               past : Person => Number => Str; participle : PartType => Str;
+               subjunctive : Aspect => Person => Number => Str} ;
+  lincat VPSlash = Verb ** {c2 : 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 ! Sg) ++ td (x.imperative ! 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,10 @@
+concrete GrammarHye of Grammar = 
+  TenseX,
+  PhraseHye,
+  NounHye,
+  VerbHye,
+  AdjectiveHye,
+  AdverbHye,
+  SentenceHye,
+  StructuralHye ** {
+}

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,5 @@
+concrete LexiconHye of Lexicon = CatHye ** open ParadigmsHye in {
+lin apple_N = mkN001 "խնձոր" ;
+lin man_N = mkN047 "տղամարդ" ;
+lin woman_N = mkN034 "կին" ;
+}

src/armenian/NounHye.gf

@@ -0,0 +1,35 @@
+concrete NounHye of Noun = CatHye ** open ResHye in {
+  lin AdjCN ap cn = {
+        s = \\sp,c,n =>
+                case ap.isPre of {
+                  True  => ap.s ! Indef ! Nom ! Sg ++ cn.s ! sp ! c ! n;
+                  False => cn.s ! sp ! c ! n ++ ap.s ! Indef ! Nom ! Sg
+                }
+      } ;
+  lin AdvCN cn adv = {
+        s = \\sp,c,num => adv.s ++ cn.s ! sp ! c ! num
+      } ;
+  lin DefArt = {s = []; sp = Def} ;
+  lin DetCN det cn = {s = \\c => det.s ++ cn.s ! det.sp ! c ! det.n;
+                      a = {n=det.n; p=P3}} ;
+  lin DetQuant quant num = {s = quant.s ++ num.s; n = num.n; sp=quant.sp} ;
+  lin IndefArt = {s = "մի"; sp = Indef} ;
+  lin NumPl = {s = []; n = Pl} ;
+  lin NumSg = {s = []; n = Sg} ;
+  lin MassNP cn = {
+        s = \\c => cn.s ! Indef ! c ! Sg;
+        a = {n=Sg; p=P3}
+      } ;
+  lin PossPron pron = {s = pron.empty; sp = Poss pron.a.p} ;
+  lin UseN n = {
+        s = \\sp,c,num =>
+                case <sp,c> of {
+                  <Def,Nom> => n.def_nom ! num ;
+                  <Def,Dat> => n.def_dat ! num ;
+                  <Poss P1,_> => n.poss1 ! c ! num ;
+                  <Poss P2,_> => n.poss2 ! c ! num ;
+                  _         => n.s ! c ! num
+                }
+      } ;
+  lin UsePron pron = {s = \\c => pron.s; a=pron.a} ;
+}

src/armenian/ParadigmsHye.gf

@@ -0,0 +1,500 @@
+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; isPre=False} ;
+  
+  singular : Number = Sg ;
+  plural : Number = Pl ;
+
+  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; sp=Indef} ;
+  mkDet : Str -> Number -> Det = \s,n -> lin Det {s=s; n=n; sp=Indef} ;
+  mkPredet : Str -> Predet = \s -> lin Predet {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} ;
+
+  mkPron : Str -> Number -> Person -> Pron = \s,n,p -> 
+    lin Pron {
+      s = s ;
+      empty = [] ;
+      a = {n = n; p = p}
+    } ;
+}

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,268 @@
+resource ResHye = ParamX ** {
+
+param Aspect = Non_Past | Perfect ;
+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: 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 = 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
+                                                }
+                                        }
+                          }
+          } ;
+
+param Species = Indef | Def | Poss Person ;
+oper Agr = {n : Number; p : Person} ;
+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/armenian/SentenceHye.gf

@@ -0,0 +1,14 @@
+concrete SentenceHye of Sentence = CatHye ** open Prelude,ResHye in {
+  lin PredVP np vp = {s = np.s ! Nom ++ vp.s;
+                      conditional = \\a,n => np.s ! Nom ++ vp.conditional ! a ! P3 ! n;
+                      converb = {imperfective = np.s ! Nom ++ vp.converb.imperfective;
+                                 futCon1 = np.s ! Nom ++ vp.converb.futCon1;
+                                 futCon2 = np.s ! Nom ++ vp.converb.futCon2;
+                                 negative = np.s ! Nom ++ vp.converb.negative;
+                                 perfective = np.s ! Nom ++ vp.converb.perfective;
+                                 simultaneous = np.s ! Nom ++ vp.converb.simultaneous};
+                      passive = np.s ! Nom ++ vp.passive;
+                      past = \\_,n => np.s ! Nom ++ vp.past ! P3 ! n;
+                      participle = \\p => np.s ! Nom ++ vp.participle ! p;
+                      subjunctive = \\a,n => np.s ! Nom ++ vp.subjunctive ! a ! P3 ! n} ;
+}

src/armenian/StructuralHye.gf

@@ -0,0 +1,8 @@
+concrete StructuralHye of Structural = CatHye ** open ResHye, ParadigmsHye in {
+lin i_Pron = mkPron "ես" Sg P1 ;
+lin youSg_Pron = mkPron "դու" Sg P2 ;
+lin he_Pron, she_Pron, it_Pron = mkPron "նա" Sg P3 ;
+lin we_Pron = mkPron "մեք" Pl P1 ;
+lin youPl_Pron = mkPron "դուք" Pl P2 ;
+lin they_Pron = mkPron "նոքա" Pl P3 ;
+}

src/armenian/VerbHye.gf

@@ -0,0 +1,35 @@
+concrete VerbHye of Verb = CatHye ** open Prelude,ResHye in {
+  lin AdvVP vp adv = {s = adv.s ++ vp.s;
+                      conditional = \\a,p,n => adv.s ++ vp.conditional ! a ! p ! n;
+                      converb = {imperfective = adv.s ++ vp.converb.imperfective;
+                                 futCon1 = adv.s ++ vp.converb.futCon1;
+                                 futCon2 = adv.s ++ vp.converb.futCon2;
+                                 negative = adv.s ++ vp.converb.negative;
+                                 perfective = adv.s ++ vp.converb.perfective;
+                                 simultaneous = adv.s ++ vp.converb.simultaneous};
+                      imperative = \\n => vp.imperative ! n ++ adv.s;
+                      passive = adv.s ++ vp.passive;
+                      past = \\p,n => adv.s ++ vp.past ! p ! n;
+                      participle = \\p => adv.s ++ vp.participle ! p;
+                      subjunctive = \\a,p,n => adv.s ++ vp.subjunctive ! a ! p ! n} ;
+  lin ComplSlash vp np = {s = vp.s ++ vp.c2.s ++ np.s ! vp.c2.c;
+                          conditional = \\a,p,n => vp.conditional ! a ! p ! n
+                                                     ++ vp.c2.s ++ np.s ! vp.c2.c;
+                          converb = {imperfective = vp.converb.imperfective
+                                                      ++ vp.c2.s ++ np.s ! vp.c2.c;
+                                     futCon1 = vp.converb.futCon1 ++ vp.c2.s ++ np.s ! vp.c2.c;
+                                     futCon2 = vp.converb.futCon2 ++ vp.c2.s ++ np.s ! vp.c2.c;
+                                     negative = vp.converb.negative ++ vp.c2.s ++ np.s ! vp.c2.c;
+                                     perfective = vp.converb.perfective
+                                                    ++ vp.c2.s ++ np.s ! vp.c2.c;
+                                     simultaneous = vp.converb.simultaneous
+                                                      ++ vp.c2.s ++ np.s ! vp.c2.c};
+                          imperative = \\n => vp.imperative ! n ++ vp.c2.s ++ np.s ! Nom;
+                          passive = vp.passive ++ vp.c2.s ++ np.s ! vp.c2.c;
+                          past = \\p,n => vp.past ! p ! n ++ vp.c2.s ++ np.s ! vp.c2.c;
+                          participle = \\p => vp.participle ! p ++ vp.c2.s ++ np.s ! vp.c2.c;
+                          subjunctive = \\a,p,n => vp.subjunctive ! a ! p ! n
+                                                     ++ vp.c2.s ++ np.s ! vp.c2.c} ;
+  lin SlashV2a v = v ;
+  lin UseV v = v ;
+}

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 } ;
 
@@ -144,4 +144,4 @@ oper
   conjNbr : Number -> Number -> Number = \n,m ->
     case n of { Pl => Pl ; _ => m } ;
 
-}
+}

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,7 +2,8 @@ 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,7 +42,10 @@ 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) ; 
     mkN2 : Str -> Case -> N2 = \s,cas -> lin N2 (mkNoun2 s cas) ;
@@ -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,14 @@
+concrete AdjectiveBel of Adjective = CatBel ** open ResBel in {
+lin
+  PositA a = a ;
+  ComparA a np = {s = \\c,gn => "больш" ++ a.s ! c ! gn ++ "за" ++ np.s ! Acc} ;
+  ComplA2 a np = {s = \\c,gn => a.s ! c ! gn ++ prepNP a.c2 np} ;
+  ReflA2 a = {s = \\c,gn => a.s ! c ! gn ++ "да сябе"} ;
+  UseA2 a = a ;
+  UseComparA a = {s = \\c,gn => "больш" ++ a.s ! c ! gn} ;
+  CAdvAP cadv ap np = {s = \\c,gn => cadv.s ++ ap.s ! c ! gn ++ cadv.p ++ np.s ! Nom} ;
+  AdjOrd ord = ord ;
+  SentAP ap sc = {s = \\c,gn => ap.s ! c ! gn ++ sc.s} ;
+  AdAP ada ap = {s = \\c,gn => ada.s ++ ap.s ! c ! gn} ;
+  AdvAP ap adv = {s = \\c,gn => ap.s ! c ! gn ++ adv.s} ;
+}

src/belarusian/AdverbBel.gf

@@ -0,0 +1,13 @@
+concrete AdverbBel of Adverb = CatBel ** open ResBel in {
+
+lin
+  PositAdvAdj a = {s = a.s ! Nom ! GSg Neuter} ;
+  PrepNP prep np = {s = prepNP prep np} ;
+  ComparAdvAdj cadv a np = {s = cadv.s ++ a.s ! Nom ! GSg Neuter ++ cadv.p ++ np.s ! Nom} ;
+  ComparAdvAdjS cadv a s = {s = cadv.s ++ a.s ! Nom ! GSg Neuter ++ cadv.p ++ s.s} ;
+  AdAdv ada adv = {s = ada.s ++ adv.s} ;
+  PositAdAAdj a = {s = a.s ! Nom ! GSg Neuter} ;
+  SubjS subj s = {s = subj.s ++ s.s} ;
+  AdnCAdv cadv = {s = cadv.s} ;
+
+}

src/belarusian/AllBel.gf

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

src/belarusian/AllBelAbs.gf

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

src/belarusian/CatBel.gf

@@ -0,0 +1,68 @@
+concrete CatBel of Cat = CommonX ** open ResBel, (R = ParamX) in {
+
+lincat
+  S = {s : Str} ;
+  QS = {s : Str} ;
+  RS = {s : Str} ;
+  Cl = {s : R.Tense => R.Polarity => Str} ;
+  ClSlash = {s : R.Tense => R.Polarity => Str; c : Compl} ;
+  SSlash = {s : Str; c : Compl} ;
+  Imp = {s : R.Polarity => Number => Str} ;
+
+  QCl = {s : R.Tense => R.Polarity => Str} ;
+  IP = NPhrase ;
+  IComp = {s : Str} ;
+  IDet = {s : Case => Gender => Str; n : Number} ;
+  IQuant = {s : Case => Gender => Number => Str} ;
+
+  RCl = {s : R.Tense => R.Polarity => Str} ;
+  RP = {s : Str} ;
+
+  VP = VPhrase ;
+  Comp = {s : Agr => Str} ;
+  VPSlash = VSlash ;
+
+  N = Noun ;
+  N2 = Noun ** {c2 : Compl} ;
+  N3 = Noun ** {c2,c3 : Compl} ;
+  CN = CommonNoun ;
+  NP = NPhrase ;
+  Pron = {s: Case => Str; a: Agr} ;
+  Det = {s : Case => Gender => Str; n : Number} ;
+  Predet = {s : Case => Gender => Number => Str} ;
+  Quant = {s : Case => Gender => Number => Str} ;
+  Num = {s : Case => Gender => Str; n : Number} ;
+  Card = {s : Str; n : Number} ;
+  ACard = {s : Str; n : Number} ;
+  Ord = Adj ;
+  DAP = {s : Case => Gender => Str; n : Number} ;
+
+  Numeral = {s : Str} ;
+  Digits = {s : Str} ;
+  Decimal = {s : Str} ;
+
+  Conj = {s : Str; n : Number} ;
+  Subj = {s : Str} ;
+  Prep = Compl ;
+
+  V = Verb ;
+  VV,VS,VQ,VA = Verb ;
+  V2 = Verb ** {c2 : Compl} ;
+  V3,V2A,V2S,V2Q,V2V = Verb ** {c2,c3 : Compl} ;
+  A = Adj ;
+  A2 = Adj ** {c2 : Compl} ;
+  AP = AdjPhrase ;
+
+  LN = {s : Case => Str; g : Gender; n : Number} ;
+  PN = {s : Case => Str; g : Gender; n : Number} ;
+  GN = {s : Str; g : Gender} ;
+  SN = {s : Str} ;
+
+linref
+  V,VV,V2,V3,V2A,V2S,V2Q,V2V = \v -> v.infinitive ;
+  N,N2,N3 = \n -> n.s ! Nom ! Sg ;
+  A,A2,AP,Ord = \a -> a.s ! Nom ! GSg Masc ;
+  NP,IP = \np -> np.s ! Nom ;
+  S,QS,RS = \s -> s.s ;
+
+}

src/belarusian/ConjunctionBel.gf

@@ -0,0 +1,60 @@
+concrete ConjunctionBel of Conjunction = CatBel ** open ResBel in {
+
+lin
+  ConjS conj xs = {s = xs.s1 ++ conj.s ++ xs.s2} ;
+  ConjRS conj xs = {s = xs.s1 ++ conj.s ++ xs.s2} ;
+  ConjAP conj xs = {s = \\c,gn => xs.s1 ! c ! gn ++ conj.s ++ xs.s2 ! c ! gn} ;
+  ConjNP conj xs = {
+    s = \\c => xs.s1 ! c ++ conj.s ++ xs.s2 ! c ;
+    a = {g=Masc; n=conj.n; p=P3}
+  } ;
+  ConjAdv conj xs = {s = xs.s1 ++ conj.s ++ xs.s2} ;
+  ConjAdV conj xs = {s = xs.s1 ++ conj.s ++ xs.s2} ;
+  ConjIAdv conj xs = {s = xs.s1 ++ conj.s ++ xs.s2} ;
+  ConjCN conj xs = {
+    s = \\c,n => xs.s1 ! c ! n ++ conj.s ++ xs.s2 ! c ! n ;
+    voc = xs.voc ;
+    g = xs.g
+  } ;
+  ConjDet conj xs = {
+    s = \\c,g => xs.s1 ! c ! g ++ conj.s ++ xs.s2 ! c ! g ;
+    n = conj.n
+  } ;
+
+  BaseS x y = {s1 = x.s; s2 = y.s} ;
+  ConsS x xs = {s1 = x.s ++ "," ++ xs.s1; s2 = xs.s2} ;
+  BaseRS x y = {s1 = x.s; s2 = y.s} ;
+  ConsRS x xs = {s1 = x.s ++ "," ++ xs.s1; s2 = xs.s2} ;
+  BaseAdv x y = {s1 = x.s; s2 = y.s} ;
+  ConsAdv x xs = {s1 = x.s ++ "," ++ xs.s1; s2 = xs.s2} ;
+  BaseAdV x y = {s1 = x.s; s2 = y.s} ;
+  ConsAdV x xs = {s1 = x.s ++ "," ++ xs.s1; s2 = xs.s2} ;
+  BaseIAdv x y = {s1 = x.s; s2 = y.s} ;
+  ConsIAdv x xs = {s1 = x.s ++ "," ++ xs.s1; s2 = xs.s2} ;
+  BaseNP x y = {
+    s1 = x.s ;
+    s2 = y.s
+  } ;
+  ConsNP x xs = {
+    s1 = \\c => x.s ! c ++ "," ++ xs.s1 ! c ;
+    s2 = xs.s2
+  } ;
+  BaseAP x y = {s1 = x.s; s2 = y.s} ;
+  ConsAP x xs = {s1 = \\c,gn => x.s ! c ! gn ++ "," ++ xs.s1 ! c ! gn; s2 = xs.s2} ;
+  BaseCN x y = {s1 = x.s; s2 = y.s; voc = x.voc ++ "," ++ y.voc; g = x.g} ;
+  ConsCN x xs = {s1 = \\c,n => x.s ! c ! n ++ "," ++ xs.s1 ! c ! n; s2 = xs.s2; voc = x.voc ++ "," ++ xs.voc; g = xs.g} ;
+  BaseDAP x y = {s1 = x.s; s2 = y.s} ;
+  ConsDAP x xs = {s1 = \\c,g => x.s ! c ! g ++ "," ++ xs.s1 ! c ! g; s2 = xs.s2} ;
+
+lincat
+  [S] = {s1,s2 : Str} ;
+  [RS] = {s1,s2 : Str} ;
+  [Adv] = {s1,s2 : Str} ;
+  [AdV] = {s1,s2 : Str} ;
+  [IAdv] = {s1,s2 : Str} ;
+  [NP] = {s1,s2 : Case => Str} ;
+  [AP] = {s1,s2 : Case => GenNum => Str} ;
+  [CN] = {s1,s2 : Case => Number => Str; voc : Str; g : Gender} ;
+  [DAP] = {s1,s2 : Case => Gender => Str} ;
+
+}

src/belarusian/ConstructionBel.gf

@@ -0,0 +1,141 @@
+concrete ConstructionBel of Construction = CatBel ** open ResBel, ParadigmsBel, (R = ParamX) in {
+
+lincat
+  Timeunit, Hour, Weekday, Month, Monthday, Year, Language = {s : Str} ;
+
+oper
+  adjVP : Adj -> VPhrase = \a -> {
+    s = \\t,p,agr => copula t p agr ++ a.s ! Nom ! genNum agr.g agr.n ;
+    inf = "быць" ++ a.s ! Nom ! GSg Masc ;
+    imp = \\p,_ => neg p ++ "будзь" ++ a.s ! Nom ! GSg Masc
+  } ;
+
+lin
+  hungry_VP = adjVP (mkA "галодны") ;
+  thirsty_VP = adjVP (mkA "спрагнены") ;
+  tired_VP = adjVP (mkA "стомлены") ;
+  scared_VP = adjVP (mkA "спалоханы") ;
+  ill_VP = adjVP (mkA "хворы") ;
+  ready_VP = adjVP (mkA "гатовы") ;
+  has_age_VP card = {
+    s = \\t,p,a => copula t p a ++ card.s ++ "гадоў" ;
+    inf = card.s ++ "гадоў" ;
+    imp = \\p,_ => neg p ++ card.s ++ "гадоў"
+  } ;
+
+  have_name_Cl np name = {s = \\t,p => np.s ! Gen ++ "імя" ++ name.s ! Nom} ;
+  married_Cl np spouse = {s = \\t,p => np.s ! Nom ++ copula t p np.a ++ "жанаты" ++ "з" ++ spouse.s ! Instr} ;
+  what_name_QCl np = {s = \\t,p => "як" ++ "завуць" ++ np.s ! Acc} ;
+  how_old_QCl np = {s = \\t,p => "колькі гадоў" ++ np.s ! Dat} ;
+  how_far_QCl np = {s = \\t,p => "як далёка" ++ np.s ! Nom} ;
+
+  weather_adjCl ap = {s = \\t,p => copula t p defaultAgr ++ ap.s ! Nom ! GSg Neuter} ;
+  is_right_VP = adjVP (mkA "правы") ;
+  is_wrong_VP = adjVP (mkA "няправы") ;
+
+  n_units_AP card cn a = {s = \\c,gn => card.s ++ cn.s ! Gen ! Pl ++ a.s ! c ! gn} ;
+  n_units_of_NP card cn np = mkSimpleNP (card.s ++ cn.s ! Gen ! Pl ++ np.s ! Gen) Neuter Sg P3 ;
+  n_unit_CN card unit cn = nounFromStr (card.s ++ unit.s ! Nom ! Pl ++ cn.s ! Nom ! Sg) cn.g ;
+
+  bottle_of_CN np = nounFromStr ("бутэлька" ++ np.s ! Gen) Fem ;
+  cup_of_CN np = nounFromStr ("кубак" ++ np.s ! Gen) Masc ;
+  glass_of_CN np = nounFromStr ("шклянка" ++ np.s ! Gen) Fem ;
+  few_X_short_of_Y np x y = {s = np.s ! Nom ++ "бракуе" ++ x.s ! Gen ! Pl ++ "да" ++ y.s ! Gen ! Sg} ;
+
+  timeunitAdv card unit = {s = card.s ++ unit.s} ;
+  timeunitRange c1 c2 unit = {s = c1.s ++ "да" ++ c2.s ++ unit.s} ;
+  oneHour = {s = "1"} ; twoHour = {s = "2"} ; threeHour = {s = "3"} ; fourHour = {s = "4"} ;
+  fiveHour = {s = "5"} ; sixHour = {s = "6"} ; sevenHour = {s = "7"} ; eightHour = {s = "8"} ;
+  nineHour = {s = "9"} ; tenHour = {s = "10"} ; elevenHour = {s = "11"} ; twelveHour = {s = "12"} ;
+  thirteenHour = {s = "13"} ; fourteenHour = {s = "14"} ; fifteenHour = {s = "15"} ; sixteenHour = {s = "16"} ;
+  seventeenHour = {s = "17"} ; eighteenHour = {s = "18"} ; nineteenHour = {s = "19"} ; twentyHour = {s = "20"} ;
+  twentyOneHour = {s = "21"} ; twentyTwoHour = {s = "22"} ; twentyThreeHour = {s = "23"} ; twentyFourHour = {s = "24"} ;
+  timeHour h = {s = "а" ++ h.s} ;
+  timeHourMinute h m = {s = "а" ++ h.s ++ ":" ++ m.s} ;
+
+  weekdayPunctualAdv d = {s = "у" ++ d.s} ;
+  weekdayHabitualAdv d = {s = "па" ++ d.s} ;
+  weekdayLastAdv d = {s = "мінулай" ++ d.s} ;
+  weekdayNextAdv d = {s = "наступнай" ++ d.s} ;
+  monthAdv m = {s = "у" ++ m.s} ;
+  yearAdv y = {s = "у" ++ y.s} ;
+  dayMonthAdv d m = {s = d.s ++ m.s} ;
+  monthYearAdv m y = {s = m.s ++ y.s} ;
+  dayMonthYearAdv d m y = {s = d.s ++ m.s ++ y.s} ;
+  intYear i = {s = i.s} ;
+  intMonthday i = {s = i.s} ;
+
+  InLanguage l = {s = "па-" ++ l.s} ;
+  weekdayN d = nounFromStr d.s Masc ;
+  monthN m = nounFromStr m.s Masc ;
+  weekdayPN d = mkPN d.s ;
+  monthPN m = mkPN m.s ;
+  languageNP l = mkSimpleNP l.s Neuter Sg P3 ;
+  languageCN l = nounFromStr l.s Neuter ;
+
+  second_Timeunit = {s = "секунд"} ;
+  minute_Timeunit = {s = "хвілін"} ;
+  hour_Timeunit = {s = "гадзін"} ;
+  day_Timeunit = {s = "дзён"} ;
+  week_Timeunit = {s = "тыдняў"} ;
+  month_Timeunit = {s = "месяцаў"} ;
+  year_Timeunit = {s = "гадоў"} ;
+
+  monday_Weekday = {s = "панядзелак"} ;
+  tuesday_Weekday = {s = "аўторак"} ;
+  wednesday_Weekday = {s = "серада"} ;
+  thursday_Weekday = {s = "чацвер"} ;
+  friday_Weekday = {s = "пятніца"} ;
+  saturday_Weekday = {s = "субота"} ;
+  sunday_Weekday = {s = "нядзеля"} ;
+
+  january_Month = {s = "студзень"} ;
+  february_Month = {s = "люты"} ;
+  march_Month = {s = "сакавік"} ;
+  april_Month = {s = "красавік"} ;
+  may_Month = {s = "май"} ;
+  june_Month = {s = "чэрвень"} ;
+  july_Month = {s = "ліпень"} ;
+  august_Month = {s = "жнівень"} ;
+  september_Month = {s = "верасень"} ;
+  october_Month = {s = "кастрычнік"} ;
+  november_Month = {s = "лістапад"} ;
+  december_Month = {s = "снежань"} ;
+
+  afrikaans_Language = {s = "афрыкаанс"} ;
+  amharic_Language = {s = "амхарску"} ;
+  arabic_Language = {s = "арабску"} ;
+  bulgarian_Language = {s = "балгарску"} ;
+  catalan_Language = {s = "каталанску"} ;
+  chinese_Language = {s = "кітайску"} ;
+  danish_Language = {s = "дацку"} ;
+  dutch_Language = {s = "нідэрландску"} ;
+  english_Language = {s = "англійску"} ;
+  estonian_Language = {s = "эстонску"} ;
+  finnish_Language = {s = "фінску"} ;
+  french_Language = {s = "французску"} ;
+  german_Language = {s = "нямецку"} ;
+  greek_Language = {s = "грэцку"} ;
+  hebrew_Language = {s = "іўрыце"} ;
+  hindi_Language = {s = "хіндзі"} ;
+  japanese_Language = {s = "японску"} ;
+  italian_Language = {s = "італьянску"} ;
+  latin_Language = {s = "лацінску"} ;
+  latvian_Language = {s = "латышску"} ;
+  maltese_Language = {s = "мальтыйску"} ;
+  nepali_Language = {s = "непальску"} ;
+  norwegian_Language = {s = "нарвежску"} ;
+  persian_Language = {s = "персідску"} ;
+  polish_Language = {s = "польску"} ;
+  punjabi_Language = {s = "панджабі"} ;
+  romanian_Language = {s = "румынску"} ;
+  russian_Language = {s = "руску"} ;
+  sindhi_Language = {s = "сіндхі"} ;
+  spanish_Language = {s = "іспанску"} ;
+  swahili_Language = {s = "суахілі"} ;
+  swedish_Language = {s = "шведску"} ;
+  thai_Language = {s = "тайску"} ;
+  turkish_Language = {s = "турэцку"} ;
+  urdu_Language = {s = "урду"} ;
+
+}