Change elve to elleve in both Norwegians

Added very minimally functional Tamil

.github/workflows/release.yml

@@ -0,0 +1,61 @@
+name: Create RGL release
+
+on:
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: Release tag (should be YYYYMMDD format)
+
+jobs:
+  build:
+    runs-on: ubuntu-18.04
+    env:
+      GF_VERSION: 3.10-1
+      DEST: gf-rgl-${{ github.event.inputs.tag  }}
+
+    steps:
+    - name: Checkout repository
+      uses: actions/checkout@v2
+
+    - name: Install GF
+      run: |
+        curl -s https://www.grammaticalframework.org/download/gf_${GF_VERSION}_amd64.deb -o gf.deb
+        sudo dpkg -i gf.deb
+
+    - name: Build RGL
+      run: |
+        mkdir -p ${DEST}
+        bash Setup.sh --dest=${DEST} --gf=gf --verbose
+
+    - name: Create archive
+      run: |
+        zip asset.zip -r ${{ env.DEST }}
+
+    # - name: Upload artifact
+    #   uses: actions/upload-artifact@v2
+    #   with:
+    #     name: gf-rgl-${{ github.sha }}
+    #     path: ${{ env.DEST }}
+    #     if-no-files-found: error
+
+    - name: Create release
+      id: create_release
+      uses: actions/create-release@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        tag_name: ${{ github.event.inputs.tag  }}
+        release_name: Release ${{ github.event.inputs.tag }}
+        draft: false
+        prerelease: false
+
+    - name: Upload release asset
+      id: upload-release-asset
+      uses: actions/upload-release-asset@v1
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      with:
+        upload_url: ${{ steps.create_release.outputs.upload_url }}
+        asset_path: asset.zip
+        asset_name: gf-rgl-${{ github.event.inputs.tag }}.zip
+        asset_content_type: application/zip

.gitignore

@@ -4,3 +4,4 @@ dist/
 *.o
 *.pgf
 *.tmp
+*~

.travis.yml

@@ -4,7 +4,7 @@ language: c
 os:
   - linux
   - osx
-  - windows
+#  - windows
 
 addons:
   apt:
@@ -12,7 +12,7 @@ addons:
       - ghc
 
 before_install:
-  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update && brew install ghc@8.2 && export PATH="/usr/local/opt/ghc@8.2/bin:$PATH" ; fi
+  - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update && brew install ghc@8.6 && export PATH="/usr/local/opt/ghc@8.6/bin:$PATH" ; fi
   - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then curl http://www.grammaticalframework.org/download/gf-3.9-bin-intel-mac.tar.gz > gf.tar.gz && sudo tar --no-same-owner --no-same-permissions -C /usr/local -zxf gf.tar.gz && rm gf.tar.gz; fi
   - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then curl http://www.grammaticalframework.org/download/gf_3.9.1-1_amd64-trusty.deb > gf.deb && sudo dpkg -i gf.deb && rm gf.deb ; fi
   - if [[ "$TRAVIS_OS_NAME" == "windows" ]]; then choco install ghc --version=8.4.4 && export PATH="/c/ProgramData/chocolatey/lib/ghc/tools/ghc-8.4.4/bin:$PATH"; fi

Makefile

@@ -1,16 +1,32 @@
-# A simple wrapper over the Haskell-based RGL build script
+# A wrapper over the Haskell and Bash build scripts
+# Will try and fallback in order:
+#   - runghc Setup.hs
+#   - stack runghc Setup.hs
+#   - ./Setup.sh
 
-RUNMAKE=runghc Setup.hs
+ifneq (, $(shell which runghc))
+RUNGHC=runghc Setup.hs
+else ifneq (, $(shell which stack))
+RUNGHC=stack runghc Setup.hs
+else
+RUNGHC=
+endif
 
 .PHONY: build copy install doc clean
 
 default: build copy
 
 build: src/*/*.gf
-	$(RUNMAKE) build
+ifneq (, $(RUNGHC))
+	$(RUNGHC) build
+else
+	./Setup.sh
+endif
 
 copy:
-	$(RUNMAKE) copy
+ifneq (, $(RUNGHC))
+	$(RUNGHC) copy
+endif
 
 install: build copy
 
@@ -18,4 +34,8 @@ doc: build
 	make -C doc GF_LIB_PATH=../dist
 
 clean:
-	$(RUNMAKE) clean
+ifneq (, $(RUNGHC))
+	$(RUNGHC) clean
+else
+	rm -r dist
+endif

README.md

@@ -2,11 +2,9 @@
 
 # GF Resource Grammar Library (RGL)
 
-[![Build Status](https://travis-ci.org/GrammaticalFramework/gf-rgl.svg?branch=master)](https://travis-ci.org/GrammaticalFramework/gf-rgl)
-
 The GF Resource Grammar Library is the standard library for Grammatical Framework. It covers the morphology and basic syntax of over 30 languages.
 
-For more about the RGL, see the [synopsis page](http://www.grammaticalframework.org/lib/doc/synopsis.html).
+For more about the RGL, see the [synopsis page](http://www.grammaticalframework.org/lib/doc/synopsis/).
 
 ## Choose your build method
 
@@ -47,12 +45,7 @@ This file should be kept up-to-date and all build methods should read this confi
 
 If default is `y` then anything other than `n`, including the empty string, is treated as true (and vice versa when default is `n`).
 
-## Haskell script: `Setup.hs`
-
-This build method gives you most options.
-You will need Haskell installed on your system.
-
-### Basic
+## Using Make
 
 If you have `Make` installed and don't care about advanced settings,
 you can compile the RGL and install it to the default location with:
@@ -64,9 +57,15 @@ make install
 This is the same as `make build` followed by `make copy`.
 There is also `make clean` available.
 
-### Advanced
+The Makefile will try to use the Haskell install script,
+falling back to the shell script if you do not have Haskell installed.
 
-For more fine-grained control over the build process, you can run the build script directly:
+## Haskell script: `Setup.hs`
+
+This build method gives you most options.
+You will need Haskell installed on your system.
+
+Run the build script with:
 
 ```
 runghc Setup.hs ...

RELEASE.md

@@ -0,0 +1,10 @@
+# RGL releases
+
+The RGL does not use semantic versioning.
+Releases are instead made periodically, as snapshots of the current state of the library.
+Releases are Git tagged `YYYYMMDD`, and for each release a binary package (as `.gfo` files) is made available as a GitHub release.
+
+## Creating a new release
+
+1. Run the "Create release" workflow through the GitHub actions interface
+   (instructions [here](https://docs.github.com/en/free-pro-team@latest/actions/managing-workflow-runs/manually-running-a-workflow)).

Setup.bat

@@ -7,7 +7,7 @@ REM ---
 
 REM Modules to compile for each language
 REM TODO read from languages.csv
-set langs=Afr Amh Ara Eus Bul Cat Chi Dan Dut Eng Est Fin Fre Grc Gre Heb Hin Ger Ice Ina Ita Jpn Lat Lav Mlt Mon Nep Nor Nno Pes Pol Por Pnb Ron Rus Snd Spa Swe Tha Tur Urd
+set langs=Afr Amh Ara Eus Bul Cat Chi Cze Dan Dut Eng Est Fin Fre Grc Gre Heb Hin Hun Ger Ice Ina Ita Jpn Lat Lav Mlt Mon Nep Nor Nno Pes Pol Por Pnb Ron Rus Slo Snd Spa Swe Tha Tur Urd
 set modules_langs=All Symbol Compatibility
 set modules_api=Try Symbolic
 
@@ -37,20 +37,6 @@ if "%dest%"=="" (
 )
 :BreakLibPath
 
-set DATA_DIR=..\gf-core\DATA_DIR
-if "%dest%"=="" (
-  REM Look in already compiled GF folder
-  if exist %DATA_DIR% (
-    for /f "delims=" %%x in (%DATA_DIR%) do (
-      if not "%%x"=="" (
-        set dest=%%x\lib
-        goto BreakDataDir
-      )
-    )
-  )
-)
-:BreakDataDir
-
 if "%dest%"=="" (
   echo Unable to determine where to install the RGL. Please do one of the following:
   echo  - Pass the --dest=... flag to this script

Setup.hs

@@ -8,8 +8,8 @@ import System.IO (hPutStrLn,stderr)
 import System.IO.Error (catchIOError)
 import System.Exit (ExitCode(..),exitFailure)
 import System.Environment (getArgs,lookupEnv)
-import System.Process (rawSystem)
-import System.FilePath ((</>),splitSearchPath) -- ,takeFileName,addExtension,dropExtension)
+import System.Process (rawSystem,readProcess)
+import System.FilePath ((</>),splitSearchPath)
 import System.Directory (createDirectoryIfMissing,copyFile,getDirectoryContents,removeDirectoryRecursive,findFile)
 #if __GLASGOW_HASKELL__>=800
 import System.Directory (getModificationTime,setModificationTime)
@@ -61,7 +61,7 @@ errLocation = unlines $
   [ "Unable to determine where to install the RGL. Please do one of the following:"
   , " - Pass the " ++ destination_flag ++ "... flag to this script"
   , " - Set the GF_LIB_PATH environment variable"
-  , " - Compile & install GF from the gf-core repository (must be in same directory as gf-rgl)"
+  , " - Compile & install GF from the gf-core repository"
   ]
 
 -- | Copy single file between directories
@@ -116,10 +116,11 @@ data Info = Info
 mkInfo :: IO Info
 mkInfo = do
   args <- getArgs
+  let gf = maybe default_gf id (getFlag gf_flag args)
   -- Look for install location in a few different places
   let mflag = getFlag destination_flag args
-  mbuilt <- catchIOError (readFile "../gf-core/DATA_DIR" >>= \d -> return (Just (d </> "lib"))) (\e -> return Nothing)
   menvar <- lookupEnv "GF_LIB_PATH" >>= return . fmap (head . splitSearchPath)
+  mbuilt <- catchIOError (readProcess gf ["--version"] "" >>= return . getPath) (\e -> return Nothing)
   let
     inst_dir =
       case catMaybes [mflag,menvar,mbuilt] of
@@ -129,12 +130,18 @@ mkInfo = do
   return $ Info
     { infoBuildDir = "dist"
     , infoInstallDir = inst_dir
-    , infoGFPath = maybe default_gf id (getFlag gf_flag args)
+    , infoGFPath = gf
     , infoVerbose = verbose
     }
   where
     default_gf = "gf"
 
+    getPath s =
+      let l = last (lines s)
+      in if take 14 l == "Shared folder:"
+           then Just (drop 15 l </> "lib")
+           else Nothing
+
 getRGLBuildDir :: Info -> Mode -> FilePath
 getRGLBuildDir info mode = infoBuildDir info </> getRGLBuildSubDir mode
 

Setup.sh

@@ -38,15 +38,15 @@ done
 if [ -z "$dest" ]; then
   dest=$(echo "$GF_LIB_PATH" | sed 's/:.*$//')
 fi
-if [ -z "$dest" ] && [ -f "../gf-core/DATA_DIR" ]; then
-  dest=$(cat ../gf-core/DATA_DIR)
+if [ -z "$dest" ] && [ "$(gf --version | tail -1 | cut -c -14)" == "Shared folder:" ]; then
+  dest=$(gf --version | tail -1 | cut -c 16-)
   if [ -n "$dest" ]; then dest="${dest}/lib"; fi
 fi
 if [ -z "$dest" ]; then
   echo "Unable to determine where to install the RGL. Please do one of the following:"
   echo " - Pass the --dest=... flag to this script"
   echo " - Set the GF_LIB_PATH environment variable"
-  echo " - Compile & install GF from the gf-core repository (must be in same directory as gf-rgl)"
+  echo " - Compile & install GF from the gf-core repository"
   exit 1
 fi
 
@@ -72,6 +72,7 @@ for lang in $langs; do
   for mod in $modules_langs $modules_api; do
     if [ $mod == "Compatibility" ] && [[ "$langs_compat" != *"$lang"* ]]; then continue; fi
     if [ $mod == "Try" ] && [[ "$langs_try" != *"$lang"* ]]; then continue; fi
+    if [ $mod == "Symbol" ] && [[ "$langs_try" != *"$lang"* ]]; then continue; fi
     if [ $mod == "Symbolic" ] && [[ "$langs_symbolic" != *"$lang"* ]]; then continue; fi
     for file in "${src}"/*/"${mod}${lang}".gf; do
       if [ ! -f "$file" ]; then continue; fi
@@ -96,5 +97,7 @@ for module in $modules_alltenses; do
 done
 
 # Copy
+if [ $dest == $dist ]; then exit 0; fi
 echo "Copying to ${dest}"
-cp -R -p "${dist}"/* "${dest}"
+mkdir -p "${dest}"
+cp -R "${dist}"/* "${dest}"

doc/.gitignore

@@ -1,4 +1,5 @@
 synopsis/index.txt
+synopsis/index-t2t.html
 synopsis/index.html
 synopsis/api-examples-*.txt
 synopsis/api-examples.gfs
@@ -6,3 +7,7 @@ synopsis/categories-imagemap.html
 synopsis/categories.png
 
 gfdoc/sources.html
+
+rgl-publications.html
+status.html
+translation.html

doc/CountLines.hs

@@ -0,0 +1,99 @@
+import System.Directory
+import Data.Char
+import Data.List
+
+-- counting modules and lines in RGL implementations
+-- leaving out Lexicon, Structural, dictionaries, Extra, Extend,... (see below the list of prefixes)
+
+main = do
+  mapM_ getCounts allLanguages
+
+getCounts (lan,language) = do
+  cs <- mapM (getCount language lan) prefixes
+  let (ms,ls) = unzip cs
+  putStrLn $ unwords [language, show (sum ms), show (sum ls)]
+  
+getCount language lan pref = do
+  let file = concat ["../src/",language,"/",pref,lan,".gf"]
+---  putStrLn file
+  ms <- readFileIf file
+  case ms of
+    Nothing -> return (0,0)
+    Just s  -> return (1,length (codeLines (lines s)))
+
+codeLines ls = filter (\l -> not (all isSpace l || isPrefixOf "--" l)) ls
+
+readFileIf name = do
+  b <- doesFileExist name
+  case b of
+    True  -> readFile name >>= return . Just
+    False -> return Nothing
+
+
+prefixes = [
+   "Adjective"
+  ,"Adverb"
+  ,"Cat"
+  ,"Common"
+  ,"Conjunction"
+  ,"Diff"
+  ,"Grammar"
+  ,"Lang"
+--  ,"Lexicon"
+  ,"Noun"
+  ,"Numeral"
+  ,"Phrase"
+  ,"Question"
+  ,"Relative"
+  ,"Sentence"
+--  ,"Structural"
+  ,"Tense"
+  ,"Text"
+  ,"Verb"
+  ,"Res"
+  ,"Morpho"
+  ,"Phono"
+  ,"Paradigms"
+  ]
+
+allLanguages = [
+   ("",   "abstract")
+  ,("Afr","afrikaans")
+  ,("Ara","arabic")
+---  ,("Bul","bulgarian") ---- todo convert to utf8
+  ,("Cat","catalan")
+  ,("Chi","chinese")
+  ,("Dan","danish")
+  ,("Dut","dutch")
+  ,("Eng","english")
+  ,("Est","estonian")
+  ,("Eus","basque")
+  ,("Fin","finnish")
+  ,("Fre","french")
+  ,("Ger","german")
+  ,("Gre","greek")
+  ,("Hin","hindi")
+  ,("Ice","icelandic")
+  ,("Ita","italian")
+  ,("Jpn","japanese")
+  ,("Lav","latvian")
+  ,("Mlt","maltese")
+  ,("Mon","mongolian")
+  ,("Nep","nepali")
+  ,("Nno","nynorsk")
+  ,("Nor","norwegian")
+  ,("Pes","persian")
+  ,("Pnb","punjabi")
+  ,("Pol","polish")
+  ,("Por","portuguese")
+----  ,("Ron","romanian")
+  ,("Rus","russian")
+  ,("Snd","sindhi")
+  ,("Spa","spanish")
+  ,("Swe","swedish")
+  ,("Tha","thai")
+  ,("Urd","urdu")
+  ,("Romance","romance")
+  ,("Scand","scandinavian")
+  ,("Hindustani","hindustani")
+  ]

doc/example-tables.gfs

@@ -0,0 +1,9 @@
+-- gf -run alltenses/LangIce.gfo <example-tables.gfs
+
+gt MkDocument (NoDefinition "") (InflectionN ?) "" | l | wf -file="example-tables.html"
+gt MkDocument (NoDefinition "") (InflectionA ?) "" | l | wf -append -file="example-tables.html"
+gt MkDocument (NoDefinition "") (InflectionV ?) "" | l | wf -append -file="example-tables.html"
+gt MkDocument (NoDefinition "") (InflectionV2 ?) "" | l | wf -append -file="example-tables.html"
+gt MkDocument (NoDefinition "") (InflectionV3 ?) "" | l | wf -append -file="example-tables.html"
+gt MkDocument (NoDefinition "") (InflectionVV ?) "" | l | wf -append -file="example-tables.html"
+gt MkDocument (NoDefinition "") (InflectionV2V ?) "" | l | wf -append -file="example-tables.html"

doc/rgl-publications.txt

@@ -67,6 +67,16 @@ http://acl.ldc.upenn.edu/W/W07/W07-08.pdf
 //and agreement of constructions with numerals.//
 
 
+===Basque===
+
+- **Source**: https://github.com/GrammaticalFramework/gf-rgl/tree/master/src/basque (Inari Listenmaa, Francis Tyers)
+
+- **Publications**
+
+Inari Listenmaa.
+//Formal Methods for Testing Grammars.// PhD thesis. Chalmers University of Technology and University of Gothenburg. 2019. [PDF https://gupea.ub.gu.se/bitstream/2077/59037/1/gupea_2077_59037_1.pdf]
+#BR
+//Mentioned in Chapter 5 of the thesis.//
 
 
 ===Bulgarian===
@@ -117,6 +127,10 @@ Appendix to the GF book (A. Ranta, //Grammatical Framework//, CSLI 2011),
 http://www.grammaticalframework.org/gf-book/gf-chinese-appendix.pdf
 
 
+===Czech===
+
+- **Source**: https://github.com/GrammaticalFramework/gf-rgl/tree/master/src/czech (Aarne Ranta, Michal Měchura)
+
 
 ===Danish===
 
@@ -155,8 +169,13 @@ The GF Resource Grammar Library.
 
 - **Source**: http://www.grammaticalframework.org/lib/src/estonian (Kaarel Kaljurand, Inari Listenmaa)
 
-%- **Publications**
+- **Publications**
 
+Inari Listenmaa and Kaarel Kaljurand.
+Computational Estonian Grammar in Grammatical Framework.
+//Proceedings of the SALTMIL Workshop at LREC//,
+2014.
+[PDF http://ixa2.si.ehu.es/~jipsagak/SALTMIL/LREC_2014_Workshop_Proceedings_Saltmil.pdf]
 
 
 ===Finnish===
@@ -256,6 +275,9 @@ In The 3rd Workshop
 on South and Southeast Asian NLP, COLING 2012. //Reprinted in Shafqat's thesis//
 
 
+===Hungarian===
+
+- **Source**: https://github.com/GrammaticalFramework/gf-rgl/tree/master/src/hungarian (Inari Listenmaa, Julia Jansson)
 
 
 ===Icelandic===
@@ -281,8 +303,6 @@ Bjarki Traustason, MSc thesis, Chalmers
 %- **Publications**
 
 
-
-
 ===Japanese===
 
 - **Source**: http://www.grammaticalframework.org/lib/src/japanese (Liza Zimina)
@@ -302,14 +322,31 @@ Lecture Notes in Computer Science Volume 7614, 2012, pp 156-167.
 http://link.springer.com/chapter/10.1007%2F978-3-642-33983-7_16
 
 
+===Korean===
+
+- **Source**: https://github.com/GrammaticalFramework/gf-rgl/tree/master/src/korean (Inari Listenmaa)
+
 
 
 ===Latin===
 
-- **Source**: http://www.grammaticalframework.org/lib/src/latin (Aarne Ranta)
+- **Source**: http://www.grammaticalframework.org/lib/src/latin (Herbert Lange, Aarne Ranta)
 
-%- **Publications**
+- **Publications**
 
+Herbert Lange.
+Erstellen einer Grammatik für das Lateinische im “Grammatical Framework”,
+Master’s thesis (Magiserarbeit), Ludwig-Maximilians-University Munich, 2013.
+
+Herbert Lange. Implementation of a Latin Grammar in Grammatical Framework, //DATeCH//, 2017.
+
+Herbert Lange and Peter Ljunglöf.
+MULLE: A grammar-based Latin language learning tool to supplement the classroom setting.
+//Proceedings of the 5th Workshop on Natural Language Processing Techniques for Educational Applications//,
+2018.
+[PDF https://www.aclweb.org/anthology/W18-3715.pdf]
+#BR
+//Latin RGL used in a language-learning application.//
 
 
 ===Latvian===
@@ -397,6 +434,15 @@ Slide presentation, TYPES 2010, Warsaw,
 http://www.mimuw.edu.pl/~asl/publications/types2010-slides.pdf
 
 
+===Portuguese===
+
+- **Source**: https://github.com/GrammaticalFramework/gf-rgl/tree/master/src/portuguese (Bruno Cuconato)
+
+- **Publications**
+
+Bruno Cuconato Claro.
+//A computational grammar for Portuguese//. MSc thesis. Rio de Janeiro, 2019.
+
 
 ===Punjabi===
 
@@ -438,7 +484,7 @@ LNCS 6008,
 
 ===Russian===
 
-- **Source**: http://www.grammaticalframework.org/lib/src/russian (Janna Khegai, Nikita Frolov)
+- **Source**: http://www.grammaticalframework.org/lib/src/russian (Janna Khegai, Nikita Frolov, Roman Suzi)
 
 - **Publications**
 
@@ -475,6 +521,21 @@ MSc Thesis, Chalmers University of Technology,
 http://publications.lib.chalmers.se/records/fulltext/163234.pdf
 
 
+===Slovak===
+
+- **Source**: https://github.com/GrammaticalFramework/gf-rgl/tree/master/src/slovak (Aarne Ranta, Slavomír Čéplö, Michal Měchura)
+
+
+===Slovenian===
+
+- **Source**: https://github.com/GrammaticalFramework/gf-rgl/tree/master/src/slovenian (Krasimir Angelov, Anna Ehrlemark)
+
+
+===Somali===
+
+- **Source**: https://github.com/GrammaticalFramework/gf-rgl/tree/master/src/somali (Inari Listenmaa)
+
+
 ===Spanish===
 
 - **Source**: http://www.grammaticalframework.org/lib/src/spanish  http://www.grammaticalframework.org/lib/src/romance
@@ -485,7 +546,8 @@ http://publications.lib.chalmers.se/records/fulltext/163234.pdf
 
 ===Swahili===
 
-- **Source**: http://www.grammaticalframework.org/lib/src/swahili (Wanjiku Ng'ang'a)
+- **Source**: http://www.grammaticalframework.org/lib/src/swahili (Benson Kituku).
+- **Previous version**: https://github.com/GrammaticalFramework/gf-rgl/tree/master/src/swahili/old (Wanjiku Ng'ang'a).
 
 
 - **Publications**
@@ -519,10 +581,6 @@ P. Sojka et al (eds), TSD 2012, LNCS 7499, pp. 183-190.
 http://link.springer.com/content/pdf/10.1007%2F978-3-642-32790-2_22.pdf
 
 
-
-
-
-
 ===Thai===
 
 - **Source**: http://www.grammaticalframework.org/lib/src/thai (Aarne Ranta, Chotiros Kairoje)
@@ -556,3 +614,17 @@ July 21-22, 2007, LSA 2007 Linguistic Institute, Stanford University.
 2007.
 
 See also **Hindi** above.
+
+
+===Zulu===
+
+- **Source:** https://github.com/LauretteM/gf-rgl-zul/tree/master/src/zulu (Laurette Marais, Laurette Pretorius)
+
+- **Publications**
+
+Laurette Marais, Johannes A. Louw, Jaco Badenhorst, Karen Calteaux, Ilana Wilken, Nina van Niekerk,and Glenn Stein.
+AwezaMed: A Multilingual, MultimodalSpeech-To-Speech Translation Application for Maternal Health Care.
+//Proceedings of the 23rd International Conference on Information Fusion//.
+July 6-9, 2020.
+#BR
+//The article presents a health care translation system, which uses the Zulu resource grammar.//

doc/status.txt

@@ -11,60 +11,63 @@ For another view, see the
 [The Resource Grammar Library coverage map http://www.postcrashgames.com/gf_world/] .
 
 Corrections and additions are welcome! Notice that only those parts of implementations
-that are currently available via http://grammaticalframework.org
+that are currently available via https://github.com/GrammaticalFramework/gf-rgl/
 are marked in the table
 
 
-|| ISO  | Language     | Darcs | Mini | Parad | Lex | Lang | API | Symb | Irreg | Dict | Trans | tested | publ   | authors       ||
-| Afr   | Afrikaans    | +     | -    | ++    | +   | +    | +   | -    | -     | -    | -     | -      | -      | *LP,LM
-| Amh   | Amharic      | +     | +    | ++    | +   | +    | -   | -    | -     | -    | - | -      | +      | *MK
-| Ara   | Arabic       | +     | +    | +     | +   | -    | -   | -    | -     | -    | - | -      | +      | AD
-| Bul   | Bulgarian    | +     | +    | +     | +   | +    | +   | +    | +     | +    | + | ++     | +      | *KA
-| Cat   | Catalan      | +     | +    | ++    | +   | +    | +   | +    | +     | -    | + | ++     | -      | *JS,*IL
-| Chi   | Chinese      | +     | -    | ++    | +   | +    | +   | -    | -     | +    | + | -      | +      | ZL,*AR,*CP,QH
-| Dan   | Danish       | +     | +    | ++    | +   | +    | +   | +    | +     | -    | - | +      | -      | *AR
-| Dut   | Dutch        | +     | +    | ++    | +   | +    | +   | +    | +     | -    | + | +      | -      | *AR,FJ
-| Eng   | English      | +     | +    | ++    | +   | +    | +   | +    | +     | +    | + | ++     | +      | *AR,BB,KA
-| Est   | Estonian     | +     | -    | ++    | +   | +    | +   | -    | -     | -    | - | +      | +      | *KK,*IL
-| Fin   | Finnish      | +     | +    | ++    | +   | +    | +   | +    | -     | +    | + | ++     | +      | *AR,*IL
-| Fre   | French       | +     | +    | ++    | +   | +    | +   | +    | +     | +    | + | ++     | -      | *AR,RE
-| Ger   | German       | +     | +    | ++    | +   | +    | +   | +    | +     | +    | + | ++     | -      | *AR,HH,EG
-| Gre   | Greek(mod)   | +     | -    | ++    | +   | +    | +   | -    | -     | -    | - | -      | +      | *IP
-| Grc   | Greek(anc)   | -     | -    | -     | -   | -    | -   | -    | -     | -    | - | -      | +      | *HLe
-| Heb   | Hebrew       | +     | -    | -     | -   | -    | -   | -    | -     | -    | - | -      | +      | *DD
-| Hin   | Hindi        | +     | +    | ++    | +   | +    | +   | +    | -     | -    | + | +      | +      | *SV,*KP,MH,AR,PK
-| Ice   | Icelandic    | +     | -    | ++    | +   | +    | +   | -    | -     | -    | - | -      | +      | *BT
-| Ina   | Interlingua  | +     | +    | ++    | +   | +    | -   | -    | -     | -    | - | -      | -      | JB
-| Ita   | Italian      | +     | +    | ++    | +   | +    | +   | +    | -     | -    | + | ++     | -      | *AR,*RE,GP
-| Jpn   | Japanese     | +     | -    | ++    | +   | +    | +   | -    | -     | -    | + | +      | +      | *LZ
-| Lat   | Latin        | +     | -    | -     | -   | -    | -   | -    | -     | +    | - | -      | -      | *AR,*HLa
-| Lav   | Latvian      | +     | -    | ++    | +   | +    | +   | -    | -     | -    | - | +      | +      | *NG,*PP
-| Mlt   | Maltese      | +     | +    | ++    | +   | +    | +   | +    | -     | -    | - | -      | +      | *JC
-| Mon   | Mongolian    | +     | -    | ++    | +   | +    | +   | -    | -     | +    | - | -      | +      | *NE
-| Nep   | Nepali       | +     | +    | ++    | +   | +    | -   | -    | -     | -    | - | -      | +      | *DS
-| Nno   | Norwegian(n) | +     | +    | ++    | +   | +    | +   | +    | +     | -    | - | -      | -      | *SRE
-| Nor   | Norwegian(b) | +     | +    | ++    | +   | +    | +   | +    | +     | -    | - | +      | -      | *AR
-| Pes   | Persian      | +     | -    | +     | +   | +    | +   | -    | -     | -    | - | +      | +      | *SV,*EA,SM
-| Pnb   | Punjabi      | +     | +    | +     | +   | +    | +   | +    | -     | -    | - | -      | +      | *SV,MH
-| Pol   | Polish       | +     | +    | +     | +   | +    | +   | +    | -     | -    | - | +      | +      | IN,*AS
-| Ron   | Romanian     | +     | +    | ++    | +   | +    | +   | +    | -     | -    | - | +      | +      | *RE
-| Rus   | Russian      | +     | +    | ++    | +   | +    | +   | -    | -     | +    | + | -      | +      | JK,*NF
-| Snd   | Sindhi       | +     | +    | ++    | +   | +    | +   | +    | -     | -    | - | -      | +      | *SV,*JD
-| Spa   | Spanish      | +     | +    | ++    | +   | +    | +   | +    | +     | -    | + | ++     | -      | *AR,IA,TS,*IL
-| Swa   | Swahili      | +     | -    | -     | -   | -    | -   | -    | -     | -    | - | -      | +      | *WN,JM
-| Swe   | Swedish      | +     | +    | ++    | +   | +    | +   | +    | +     | +    | + | ++     | +      | *MA,*AR,MF
-| Tha   | Thai         | +     | -    | ++    | +   | +    | +   | +    | -     | -    | + | +      | -      | *AR,CK
-| Tsn   | Tswana       | -     | -    | -     | -   | -    | -   | -    | -     | -    | - | -      | -      | *LPs,AB
-| Tur   | Turkish      | +     | -    | ++    | +   | -    | -   | -    | -     | +    | - | -      | -      | *SC,KA
-| Urd   | Urdu         | +     | +    | ++    | +   | +    | +   | +    | -     | -    | - | +      | +      | *SV,MH
+|| ISO  | Language     | Parad | Lex | Lang | API | Symb | Irreg | Dict | WN | tested | publ | authors          ||
+| Afr   | Afrikaans    | ++    | +   | +    | +   | -    | -     | -    | -  | -      | -    | *LP,LM            |
+| Amh   | Amharic      | ++    | +   | +    | -   | -    | -     | -    | -  | -      | +    | *MK               |
+| Ara   | Arabic       | +     | +   | +    | +   | +    | -     | -    | -  | +      | +    | AD,*IL            |
+| Bul   | Bulgarian    | +     | +   | +    | +   | +    | +     | +    | +  | ++     | +    | *KA               |
+| Cat   | Catalan      | ++    | +   | +    | +   | +    | +     | -    | +  | ++     | -    | *JS,*IL           |
+| Chi   | Chinese      | ++    | +   | +    | +   | -    | -     | +    | +  | -      | +    | ZL,*AR,*CP,QH     |
+| Cze   | Czech        | +     | +   | +    | +   | -    | -     | -    | -  | +      | -    | *AR,*MM           |
+| Dan   | Danish       | ++    | +   | +    | +   | +    | +     | -    | -  | +      | -    | *AR               |
+| Dut   | Dutch        | ++    | +   | +    | +   | +    | +     | -    | +  | +      | -    | *AR,FJ            |
+| Eng   | English      | ++    | +   | +    | +   | +    | +     | +    | +  | ++     | +    | *AR,BB,KA         |
+| Est   | Estonian     | ++    | +   | +    | +   | -    | -     | +    | +  | +      | +    | *KK,*IL           |
+| Eus   | Basque       | ++    | +   | +    | +   | -    | -     | -    | -  | -      | +    | *IL               |
+| Fin   | Finnish      | ++    | +   | +    | +   | +    | -     | +    | +  | ++     | +    | *AR,*IL           |
+| Fre   | French       | ++    | +   | +    | +   | +    | +     | +    | -  | ++     | -    | *AR,RE            |
+| Ger   | German       | ++    | +   | +    | +   | +    | +     | +    | -  | ++     | -    | *AR,HH,EG         |
+| Gre   | Greek(mod)   | ++    | +   | +    | +   | -    | -     | -    | -  | -      | +    | *IP               |
+| Grc   | Greek(anc)   | -     | -   | -    | -   | -    | -     | -    | -  | -      | +    | *HLe              |
+| Heb   | Hebrew       | -     | -   | -    | -   | -    | -     | -    | -  | -      | +    | *DD               |
+| Hin   | Hindi        | ++    | +   | +    | +   | +    | -     | -    | -  | +      | +    | *SV,*KP,MH,AR,PK  |
+| Hun   | Hungarian    | ++    | +   | +    | +   | +    | -     | -    | -  | +      | -    | *IL,*JJ           |
+| Ice   | Icelandic    | ++    | +   | +    | +   | -    | -     | -    | -  | -      | +    | *BT               |
+| Ina   | Interlingua  | ++    | +   | +    | -   | -    | -     | -    | -  | -      | -    | JB                |
+| Ita   | Italian      | ++    | +   | +    | +   | +    | -     | -    | +  | ++     | -    | *AR,*RE,GP        |
+| Jpn   | Japanese     | ++    | +   | +    | +   | -    | -     | -    | -  | +      | +    | *LZ               |
+| Kor   | Korean       | ++    | +   | +    | +   | +    | -     | -    | -  | +      | -    | *IL               |
+| Lat   | Latin        | -     | -   | -    | -   | -    | -     | +    | -  | -      | -    | *AR,*HLa          |
+| Lav   | Latvian      | ++    | +   | +    | +   | -    | -     | -    | -  | +      | +    | *NG,*PP           |
+| Mlt   | Maltese      | ++    | +   | +    | +   | +    | -     | -    | -  | -      | +    | *JC               |
+| Mon   | Mongolian    | ++    | +   | +    | +   | -    | -     | +    | -  | -      | +    | *NE               |
+| Nep   | Nepali       | ++    | +   | +    | -   | -    | -     | -    | -  | -      | +    | *DS               |
+| Nno   | Norwegian(n) | ++    | +   | +    | +   | +    | +     | -    | -  | -      | -    | *SRE              |
+| Nor   | Norwegian(b) | ++    | +   | +    | +   | +    | +     | -    | -  | +      | -    | *AR               |
+| Pes   | Persian      | +     | +   | +    | +   | -    | -     | -    | -  | +      | +    | SV,EA,SM,*IL      |
+| Pnb   | Punjabi      | +     | +   | +    | +   | +    | -     | -    | -  | -      | +    | *SV,MH            |
+| Pol   | Polish       | +     | +   | +    | +   | +    | -     | -    | -  | +      | +    | IN,*AS            |
+| Por   | Portuguese   | ++    | +   | +    | +   | +    | +     | +    | +  | +      | +    | *BC               |
+| Ron   | Romanian     | ++    | +   | +    | +   | +    | -     | -    | -  | +      | +    | *RE               |
+| Rus   | Russian      | ++    | +   | +    | +   | -    | -     | +    | -  | -      | +    | JK,NF,*RS         |
+| Slk   | Slovak       | +     | +   | +    | +   | -    | -     | -    | -  | +      | -    | *AR,*MM,SČ        |
+| Slv   | Slovene      | ++    | +   | +    | +   | -    | -     | -    | +  | +      | -    | *KA,AE            |
+| Snd   | Sindhi       | ++    | +   | +    | +   | +    | -     | -    | -  | -      | +    | *SV,*JD           |
+| Som   | Somali       | +     | -   | -    | -   | -    | -     | -    | -  | -      | -    | *IL               |
+| Spa   | Spanish      | ++    | +   | +    | +   | +    | +     | -    | +  | ++     | -    | *AR,IA,TS,*IL     |
+| Swa   | Swahili      | +     | +   | -    | -   | -    | -     | -    | -  | -      | +    | *WN,JM,BK         |
+| Swe   | Swedish      | ++    | +   | +    | +   | +    | +     | +    | +  | ++     | +    | *MA,*AR,MF        |
+| Tha   | Thai         | ++    | +   | +    | +   | +    | -     | -    | +  | +      | -    | *AR,CK            |
+| Tur   | Turkish      | ++    | +   | -    | -   | -    | -     | +    | +  | -      | -    | *SC,KA            |
+| Urd   | Urdu         | ++    | +   | +    | +   | +    | -     | -    | -  | +      | +    | *SV,MH            |
 
 ISO = 3-letter ISO language code, used in library file names
 (mostly ISO 639-2 B (bibliographic))
 
-Darcs = available in the darcs repository of --http://code.haskell.org/gf-- http://www.grammaticalframework.org/
-
-Mini = minimal resource, compiles with ``make minimal`` (obsolete)
-
 Parad = ``Paradigms`` file complete for major POS, ++ means with smart paradigms
 
 Lex = the resource ``Lexicon`` (nearly) complete
@@ -73,13 +76,13 @@ Lang = the resource ``Syntax`` (nearly) complete
 
 API = the ``Syntax`` compiles
 
-API = the ``Symbolic`` API compiles
+Symb = the ``Symbolic`` API complete
 
 Irreg = the ``Irreg`` module with irregular verbs exists
 
 Dict = the ``Dict`` module, large-scale morphological lexicon, exists
 
-Trans = large-scale translation module and dictionary exists
+WN = [WordNet https://cloud.grammaticalframework.org/wordnet] lexicon exists
 
 tested = tested in some applications, ++ means extensively tested with no major issues
 
@@ -93,9 +96,12 @@ authors = main contributors, * means still active
 
 AB Ansu Berg,
 AD Ali El Dada,
+AE Anna Ehrlemark,
 AR Aarne Ranta,
 AS Adam Slaski,
 BB Björn Bringert,
+BC Bruno Cuconato,
+BK Benson Kituku,
 BT Bjarki Traustason,
 CK Chotiros Kairoje,
 CP Chen Peng,
@@ -115,6 +121,7 @@ IP Ioanna Papadopoulou,
 JB Jean-Philippe Bernardy,
 JC John J. Camilleri,
 JD Jherna Devi,
+JJ Julia Jansson,
 JK Janna Khegai,
 JM Juliet Mutahi,
 JS Jordi Saludes,
@@ -128,13 +135,16 @@ MA Malin Ahlberg,
 MF Markus Forsberg,
 MK Markos Kassa Gobena,
 MH Muhammad Humayoun,
+MM Michal Měchura,
 NE Nyamsuren Erdenebadrakh,
 NF Nick Frolov,
 NG Normunds Gruzitis,
 QH Qiao Haiyan,
 RE Ramona Enache,
+RS Roman Suzi,
 PP Peteris Paikens,
 SC Server Cimen,
+SČ Slavomír Čéplö,
 SM Sofy Moradi,
 SRE Stian Rødven Eide,
 SV Shafqat Virk,
@@ -146,8 +156,7 @@ ZL Zhuo Lin Qiqige
 
 ==Rules==
 
-Only components available at http://grammaticalframework.org are indicated in the table
-(exceptions: Ancient Greek, Mongolian, to appear soon).
+Only components available at https://github.com/GrammaticalFramework/gf-rgl/ are indicated in the table.
 
 If you want to work on a language already in the table, please be kind and contact the
 active authors of it.

doc/synopsis/Makefile

@@ -29,10 +29,13 @@ index: index.html
 index.txt: MkSynopsis.hs MkExxTable.hs $(INCLUDES) $(EXAMPLES_OUT) $(SRC_FILES)
 	runghc -i$(ROOT) MkSynopsis.hs
 
-TITLE=$(shell head -n 1 index.txt)
-index.html: index.txt $(TEMPLATE)
+index-t2t.html: index.txt
 	txt2tags --target=html --no-headers --quiet --toc --outfile=$@ --infile=$<
 	sed -i.bak "s/<A NAME=\"\(.*\)\"><\/A>/<div id=\"\1\"><\/div>/" $@
+	rm "$@.bak"
+
+TITLE=$(shell head -n 1 index.txt)
+index.html: index-t2t.html $(TEMPLATE)
 	pandoc \
 		--from=html \
 		--to=html5 \
@@ -44,7 +47,7 @@ index.html: index.txt $(TEMPLATE)
 		--css="synopsis.css" \
 		--include-after-body="quicklinks.html" \
 		--output=$(TMP) \
-		$@
+		index-t2t.html
 	mv $(TMP) $@
 	sed -i.bak "s/<table>/<table class=\"table w-auto\">/" $@
 	sed -i.bak -e '/img src="categories.png"/r categories-imagemap.html' -e '/img src="categories.png"/d' $@
@@ -55,7 +58,7 @@ categories.png: categories.dot
 
 categories-imagemap.html: categories.dot
 	rm -f $@
-	echo '<img src="categories.png" usemap="#categories">' > $@
+	echo '<img src="categories.png" usemap="#categoriesmap" alt="RGL categories">' > $@
 	dot -Tcmapx $^ >> $@
 
 api-examples.gfs: api-examples.txt MkExx.hs

doc/synopsis/categories.dot

@@ -1,5 +1,5 @@
 
-digraph categories {
+digraph categoriesmap {
 
 size = "11,11" ;
 node [href="#\N"];

doc/synopsis/example.txt

@@ -3,12 +3,12 @@ The standard way of building an application has the following modules.
 
 An abstract syntax:
 ```
-  abstract Music = {    
-  cat 
-    Kind, 
+  abstract Music = {
+  cat
+    Kind ;
     Property ;
-  fun 
-    PropKind : Kind -> Property -> Kind ; 
+  fun
+    PropKind : Kind -> Property -> Kind ;
     Song : Kind ;
     American : Property ;
   }
@@ -23,8 +23,8 @@ A domain lexicon interface:
 ```
 A functor on ``Syntax`` and the domain lexicon interface:
 ```
-  incomplete concrete MusicI of Music = open Syntax, MusicLex in {
-  lincat 
+  incomplete concrete MusicI of Music = open Syntax, LexMusic in {
+  lincat
     Kind = CN ;
     Property = AP ;
   lin
@@ -35,7 +35,7 @@ A functor on ``Syntax`` and the domain lexicon interface:
 ```
 For each language, an instance of the domain lexicon:
 ```
-  instance LexMusicGer of LexMusic = CatGer ** open ParadigmsGer in {    
+  instance LexMusicGer of LexMusic = CatGer ** open ParadigmsGer in {
   oper
     song_N = mkN "Lied" "Lieder" neuter ;
     american_A = mkA "amerikanisch" ;

doc/synopsis/intro.txt

@@ -13,18 +13,16 @@ to the relevant source files, which give more information. Some of the files hav
 not yet been prepared so that the machine generated documentation has the nicest
 possible format.
 
+% These hardcoded TOC links (chapter 4 onwards) need to be updated as new languages are added.
+
 The main contents are:
-- [Chapter 1 #toc2]: categories, with links to the functions for
-constructing trees in them.
-- [Chapter 2 #toc5]: syntactic construction functions, with cross-links and
-examples.
-- [Chapter 3 #toc85]: morphological paradigms.
-- [Chapter 4 #toc120]: additional libraries.
-- [Chapter 5 #toc126]: how to "browse" the library by
-loading the grammars into the ``gf`` command editor.
-- [Chapter 6 #toc127]: a brief example of how application grammars can
-use the resource modules.
-- [Detailed table of contents #toc128].
+- [Chapter 1 #toc2]: categories, with links to the functions for constructing trees in them.
+- [Chapter 2 #toc5]: syntactic construction functions, with cross-links and examples.
+- [Chapter 3 #toc85]: morphological (lexical) paradigms.
+- [Chapter 4 #toc121]: additional libraries.
+- [Chapter 5 #toc127]: how to "browse" the library by loading the grammars into the ``gf`` command editor.
+- [Chapter 6 #toc128]: a brief example of how application grammars can use the resource modules.
+- [Detailed table of contents #toc129].
 
 
 The [RGL Browser http://www.grammaticalframework.org/~john/rgl-browser/] tool allows you to interactively browse through
@@ -43,12 +41,12 @@ abstract functions and their Universal Dependency labels
 - [Minibar http://cloud.grammaticalframework.org/minibar/minibar.html]:
   find resource grammar expressions by parsing (select Grammar: LibraryBrowser)
   or test translations between all languages (select Grammar: ResourceDemo)
-- [Resource Grammar Tutorial http://www.grammaticalframework.org/doc/gf-lrec-2010.pdf]
-  as presented in LREC-2010.
+- [Resource Grammar Tutorial http://www.grammaticalframework.org/lib/doc/rgl-tutorial/index.html],
+  as previously presented in LREC-2010.
 - Paper "The GF Resource Grammar Library" by A. Ranta
   (//Linguistic Issues in Language Technology//, 2 (2), 2009). An overview of
   the library with linguistic motivations.
-  [PDF http://elanguage.net/journals/index.php/lilt/article/viewFile/214/158]
+  [PDF http://journals.linguisticsociety.org/elanguage/lilt/article/download/214/214-501-1-PB.pdf]
 - Paper "Grammars as Software Libraries" by A. Ranta
   (In Y. Bertot, G. Huet, J-J. Lévy, and G. Plotkin (eds.),
    //From Semantics to Computer Science//, Cambridge University Press,

doc/synopsis/quicklinks.js

@@ -122,3 +122,47 @@ appendChildren(
     quicklinks()
   ]
 )
+
+/* -------------------------------------------------------------------------- */
+
+// Toggle quicklinks
+function toggleSidebar () {
+  var m = document.getElementById('main')
+  var q = document.getElementById('quicklinks')
+  var mClasses = 'col-md-9 col-xl-10'
+  var qClasses = 'col-4 col-md-3 col-xl-2 offset-8 offset-md-9 offset-xl-10'
+  if (hasClass(q, 'd-none')) {
+    // Show
+    addClass(m, mClasses)
+    addClass(q, qClasses)
+    removeClass(q, 'd-none')
+  } else {
+    // Hide
+    removeClass(m, mClasses)
+    removeClass(q, qClasses)
+    addClass(q, 'd-none')
+  }
+}
+document.getElementById('btn-quicklinks-toggle').addEventListener('click', toggleSidebar)
+if (window.innerWidth >= 768) {
+  // Below 768 (== 'md' breakpoint) sidebar overlays content and best left hidden
+  toggleSidebar()
+}
+
+/* -------------------------------------------------------------------------- */
+
+// Helpers
+
+// Won't work on IE9; use className and split
+function addClass (elem, classnames) {
+  for (var c of classnames.split(' ')) elem.classList.add(c)
+}
+function removeClass (elem, classnames) {
+  for (var c of classnames.split(' ')) elem.classList.remove(c)
+}
+// function toggleClass (elem, classnames) {
+//   for (var c of classnames.split(' ')) elem.classList.toggle(c)
+// }
+function hasClass (elem, classname) {
+  return elem.classList.contains(classname)
+}

doc/synopsis/template.html

@@ -35,15 +35,15 @@ $endfor$
 <div class="container-fluid">
 <div class="row">
 
-  <nav class="col-md-3 col-xl-2 d-none d-md-block sidebar pt-4" id="quicklinks">
-    <!-- filled dynamically via quicklinks.js -->
-  </nav>
+  <button class="btn btn-light m-1" id="btn-quicklinks-toggle" style="position: fixed; top: 0; right: 0; z-index: 10;">
+    <i class="fas fa-bars"></i>
+  </button>
 
-  <main role="main" class="col-md-9 col-xl-10 offset-md-3 offset-xl-2 pt-3">
+  <main role="main" class="col my-3" style="overflow-x: scroll" id="main">
 $if(title)$
     <header id="title-block-header">
       <a href="$rel-root$" title="Home">
-        <img src="$rel-root$/doc/Logos/gf1.svg" height="200px" class="float-md-right mb-3 bg-white" alt="GF Logo">
+        <img src="$rel-root$/doc/Logos/gf1.svg" height="200" class="float-md-right ml-3 mb-3 bg-white" alt="GF Logo">
       </a>
       <h1 class="title">$title$</h1>
 $if(subtitle)$
@@ -64,6 +64,11 @@ $if(toc)$
 $endif$
     $body$
   </main>
+
+  <nav class="d-none sidebar py-3 border-left bg-light" id="quicklinks">
+    <!-- filled dynamically via quicklinks.js -->
+  </nav>
+
 </div><!-- .row -->
 </div><!-- .container-fluid -->
 
@@ -108,8 +113,7 @@ $endif$
       </div>
 
       <div class="col-6 col-sm-3">
-        <h6 class="text-muted">Contribute</i>
-        </h6>
+        <h6 class="text-muted">Contribute</h6>
         <ul class="list-unstyled">
           <li><a href="http://groups.google.com/group/gf-dev">Mailing List</a></li>
           <li><a href="https://github.com/GrammaticalFramework/gf-core/issues">Issue Tracker</a></li>
@@ -124,8 +128,8 @@ $endif$
         <a href="https://github.com/GrammaticalFramework/gf-rgl">RGL</a> ·
         <a href="https://github.com/GrammaticalFramework/gf-contrib">Contributions</a>
       </div>
-    <div>
-  <div>
+    </div>
+  </div>
 </footer>
 $for(include-after)$
 $include-after$

languages.csv

@@ -4,7 +4,9 @@ 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
@@ -12,18 +14,20 @@ 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
+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
-Hun,Hungarian,hungarian,,,y,n,n,n,,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
-Lat,Latin,latin,,,y,,n,n,,n
+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
@@ -33,13 +37,17 @@ Pes,Persian,persian,,,,,,,,y
 Pnb,Punjabi,punjabi,,,y,,,,,y
 Pol,Polish,polish,,,,,,,,y
 Por,Portuguese,portuguese,Romance,,y,,,,y,y
-Ron,Pomanian,romanian,,,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,,,,n,n,n,y,n
+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,,,,,n,n,,n
+Tur,Turkish,turkish,,,y,,,n,,n
 Urd,Urdu,urdu,Hindustani,,,,,,,y
+Som,Somali,somali,,,,,n,n,,n

src/Lang.labels

@@ -1,170 +1,171 @@
-PredVP 	nsubj head
-PredVPS 	nsubj head
-DirectComplVQ 	empty nsubj head ccomp  -- Temp argument can only be empty in English 
-DirectComplVS 	empty nsubj head ccomp  -- Temp argument can only be empty in English 
-SlashVP 	nsubj head
-SlashVS 	nsubj head ccomp
-FocusObjS 	nsubj head              -- again might be wrong; more correct to call it dobj
-QuestIAdv 	advmod head		-- "where does John sleep" cf. AdvVP
-QuestIComp 	head nsubj	-- "where is John": John is clearly nsubj, but is where the head?
-QuestQVP 	nsubj head
-QuestSlash 	dobj head
-QuestVP 	nsubj head
+PredVP	nsubj head
+PredVPS	nsubj head
+DirectComplVQ	empty nsubj head ccomp  -- Temp argument can only be empty in English
+DirectComplVS	empty nsubj head ccomp  -- Temp argument can only be empty in English
+SlashVP	nsubj head
+SlashVS	nsubj head ccomp
+FocusObjS	nsubj head              -- again might be wrong; more correct to call it obj
+QuestIAdv	advmod head		-- "where does John sleep" cf. AdvVP
+QuestIComp	head nsubj	-- "where is John": John is clearly nsubj, but is where the head?
+QuestQVP	nsubj head
+QuestSlash	obj head
+QuestVP	nsubj head
+IdetCN		det head
 
-PredSCVP 	csubj head
+PredSCVP	csubj head
 
-ComplSlash 	head dobj
-ComplSlashIP 	head dobj
-Slash3V3 	head dobj
-SlashV2VNP 	head dobj xcomp
-PastPartAgentAP 	head dobj
-AdvQVP 	head dobj
+ComplSlash	head obj
+ComplSlashIP	head obj
+Slash3V3	head obj
+SlashV2VNP	head obj xcomp
+PastPartAgentAP	head obj
+AdvQVP	head obj
 
-Slash2V3 	head iobj
+Slash2V3	head iobj
 
-ComplVS 	head ccomp
-ComplVQ 	head ccomp
-SlashV2S 	head ccomp
-SlashV2Q 	head ccomp
-CleftAdv 	head advcl            -- not sure
+ComplVS	head ccomp
+ComplVQ	head ccomp
+SlashV2S	head ccomp
+SlashV2Q	head ccomp
+CleftAdv	head advcl            -- not sure
 
-ComplVA 	head xcomp
-ComplVV 	head xcomp
-SlashVV 	head acl
-SlashV2A 	head xcomp
-SlashV2V 	head xcomp
+ComplVA	head xcomp
+ComplVV	head xcomp
+SlashVV	head acl
+SlashV2A	head xcomp
+SlashV2V	head xcomp
 
-AdvNP 	head nmod              -- not sure
-ExtAdvNP 	head nmod      -- not sure
-PassAgentVPSlash 	head nmod    -- not sure
-CleftNP 	head acl       -- this cannot be nmod, not with type RS
+AdvNP	head nmod              -- not sure
+ExtAdvNP	head nmod      -- not sure
+PassAgentVPSlash	head nmod    -- not sure
+CleftNP	head acl       -- this cannot be nmod, not with type RS
 
-SSubjS 	head mark advcl
-RelS 	head advcl
+SSubjS	head mark advcl
+RelS	head advcl
 
-AdNum 	advmod head
-AdAP 	advmod head
-AdvAP 	head advmod
-ComparAdvAdj 	advmod amod head
-ComparAdvAdjS 	advmod amod head
-AdvIAdv 	advmod head
-AdVVP 	advmod head
-AdvVP 	head advmod
-ExtAdvVP 	head advmod
-AddAdvQVP 	head advmod
-AdVVPSlash 	advmod head
-AdvVPSlash 	head advmod
-AdvSlash 	head advmod
-ExistIPAdv 	head advmod
-AdvS 	advmod head
-ExtAdvS 	advmod head
+AdNum	advmod head
+AdAP	advmod head
+AdvAP	head advmod
+ComparAdvAdj	advmod amod head
+ComparAdvAdjS	advmod amod head
+AdvIAdv	advmod head
+AdVVP	advmod head
+AdvVP	head advmod
+ExtAdvVP	head advmod
+AddAdvQVP	head advmod
+AdVVPSlash	advmod head
+AdvVPSlash	head advmod
+AdvSlash	head advmod
+ExistIPAdv	head advmod
+AdvS	advmod head
+ExtAdvS	advmod head
 
-SubjS 	mark head
-RelVP 	mark head
-RelSlash 	mark head
+SubjS	mark head
+RelVP	mark head
+RelSlash	mark head
 
-ComplN2 	head nmod
-ComplN3 	nmod head
-AdvCN 	head nmod
-PossNP 	head nmod 
-PartNP 	head nmod 
-ExistNPAdv 	head nmod
+ComplN2	head nmod
+ComplN3	nmod head
+AdvCN	head nmod
+PossNP	head nmod
+PartNP	head nmod
+ExistNPAdv	head nmod
 
-OrdNumeralSuperl 	nummod head  -- quite wrong; cannot find relevant details in the documentation; but most probably head lies outside the score of this function 
-DetQuant 	head nummod          -- quite wrong; I think the head lies outside the scope of the function
-CNNumNP 	head nummod          
+OrdNumeralSuperl	nummod head  -- quite wrong; cannot find relevant details in the documentation; but most probably head lies outside the score of this function
+DetQuant	head nummod          -- quite wrong; I think the head lies outside the scope of the function
+CNNumNP	head nummod
 
-ApposCN 	head appos
-ApposNP 	head appos
+ApposCN	head appos
+ApposNP	head appos
 
-RelNP 	head acl
-RelCN 	head acl
-SentCN 	head acl
-SentAP 	head acl
+RelNP	head acl
+RelCN	head acl
+SentCN	head acl
+SentAP	head acl
 
-DetQuantOrd 	head nummod amod     -- quite wrong; again for same reason as DetQuant function
-DetCN 	det head
-IDetCN 	det head
-IDetQuant head empty
-CountNP 	det head
-PredetNP 	det head
+DetQuantOrd	head nummod amod     -- quite wrong; again for same reason as DetQuant function
+DetCN	det head
+IdetCN	det head
+IdetQuant head nummod
+CountNP	det head
+PredetNP	det head
 PPartNP		head amod	-- only in core RGL
 
-AdjCN 	amod head
-AdjDAP 	head amod
-CAdvAP 	case amod head
-ComparA 	amod head
-ComplA2 	amod head
-CompoundAP 	head amod
-AdAdV 	amod head
-AdAdv 	amod head
+AdjCN	amod head
+AdjDAP	head amod
+CAdvAP	case amod head
+ComparA	amod head
+ComplA2	amod head
+CompoundAP	head amod
+AdAdV	amod head
+AdAdv	amod head
 
-CompoundN 	compound head
+CompoundN	compound head
 
-IIDig 	head goeswith
+IIDig	head goeswith
 
-PrepNP 	case head
-PrepIP 	case head
-SlashPrep 	head case
-VPSlashPrep 	head case
+PrepNP	case head
+PrepIP	case head
+SlashPrep	head case
+VPSlashPrep	head case
 
-UttImpPl 	empty head
-UttImpPol 	empty head
-UttImpSg 	empty head
+UttImpPl	empty head
+UttImpPol	empty head
+UttImpSg	empty head
 
-MkVPS 	empty empty head
+MkVPS	empty empty head
 
-UseCl 	empty empty head
-UseQCl 	empty empty head
-UseRCl 	empty empty head
-UseSlash 	empty empty head
-UseVC 	empty empty head
+UseCl	empty empty head
+UseQCl	empty empty head
+UseRCl	empty empty head
+UseSlash	empty empty head
+UseVC	empty empty head
 
-BaseAP 	head conj
-BaseAdV 	head conj
-BaseAdv 	head conj
-BaseCN 	head conj
-BaseDAP 	head conj
-BaseIAdv 	head conj
-BaseNP 	head conj
-BaseRS 	head conj
-BaseS 	head conj
-ConsAP 	head conj
-ConsAdV 	head conj
-ConsAdv 	head conj
-ConsCN 	head conj
-ConsDAP 	head conj
-ConsIAdv 	head conj
-ConsNP 	head conj
-ConsRS 	head conj
-ConsS 	head conj
-ConjAP 	cc head
-ConjAdV 	cc head
-ConjAdv 	cc head
-ConjCN 	cc head
-ConjDet 	cc head
-ConjIAdv 	cc head
-ConjNP 	cc head
-ConjRS 	cc head
-ConjS 	cc head
-PhrUtt 	cc head discourse
+BaseAP	head conj
+BaseAdV	head conj
+BaseAdv	head conj
+BaseCN	head conj
+BaseDAP	head conj
+BaseIAdv	head conj
+BaseNP	head conj
+BaseRS	head conj
+BaseS	head conj
+ConsAP	head conj
+ConsAdV	head conj
+ConsAdv	head conj
+ConsCN	head conj
+ConsDAP	head conj
+ConsIAdv	head conj
+ConsNP	head conj
+ConsRS	head conj
+ConsS	head conj
+ConjAP	cc head
+ConjAdV	cc head
+ConjAdv	cc head
+ConjCN	cc head
+ConjDet	cc head
+ConjIAdv	cc head
+ConjNP	cc head
+ConjRS	cc head
+ConjS	cc head
+PhrUtt	cc head discourse
 
-PlusChunk 	head dep
-TTAnt 	empty empty head
+PlusChunk	head dep
+TTAnt	empty empty head
 
 TExclMark      head dep		-- punctuation in the middle in these three
 TFullStop      head dep
 TQuestMark     head dep
 
-ComplV2	       head dobj	-- shortcuts in App
-ComplV2V       head dobj xcomp
-ComplV3	       head iobj dobj   ---- could be dobj dobj
+ComplV2	       head obj	-- shortcuts in App
+ComplV2V       head obj xcomp
+ComplV3	       head iobj obj   ---- could be obj obj
 PassAgentV2    head ncomp	-- not sure
 RelV2	       mark nsubj head
-QuestV2	       dobj nsubj head
+QuestV2	       obj nsubj head
 
 ModCN	       amod head  -- in ResourceDemo
-RSubjS	       mark advcl head 
+RSubjS	       mark advcl head
 SlashV2	       nsubj head
 RAdvCN	       head case nmod
 SubjCl	       head mark advcl
@@ -180,7 +181,7 @@ AdV	ADV
 Adv	ADV
 CAdv	ADV
 Card	NUM
-Conj	CONJ
+Conj	CCONJ
 Det	DET
 Digits	NUM
 IAdv	ADV
@@ -193,7 +194,7 @@ N2	NOUN
 N3	NOUN
 Numeral	NUM
 Ord	NUM
-PConj	CONJ
+PConj	CCONJ
 PN	PROPN
 Predet	DET
 Prep	ADP
@@ -213,7 +214,3 @@ VA	VERB
 VQ	VERB
 VS	VERB
 VV	VERB
-
-
-
-

src/README.md

@@ -0,0 +1,78 @@
+# Introduction
+
+## Intended audience of this Readme
+
+This Readme is designed for new developers who wish to either extend/improve on a resource grammar or create a new one. It provides an overview of the relationships between files and a simple working pipeline for developers to get started.
+
+Note that while files in this folder are meant to be named with 3 letter suffixes representing the language, e.g. "ResBul" for the Bulgarian resource file, this Readme will use a 4 letter suffix "Lang" to represent a language in general, e.g. "ResLang".
+
+## Author(s) of this Readme
+
+This Readme was written by Nemo and edited by Inari on 14th August 2022.
+
+# Creating a new resource grammar
+
+If you are working on an RGL for a new language, you will need to run "Clone.hs" in the "src" folder so that you can clone a project from another language to your language to give you a basis to start with. 
+
+As per the instructions, the syntax is "Clone fromdir todir fromlang tolang", e.g. "runghc Clone swedish danish Swe Dan". You may want to add the option --comment-body after the word "Clone" to comment out every line in the body of the files to start fresh. 
+
+This is especially useful if your new language has very little in common with the language you are copying from because they come from different language families.
+
+# File hierarchy
+
+The number of files may be overwhelming, but they are related together following the graphic under "Module dependencies" under the rgl-tutorial. In the graphic, an example is that GrammarIta and ResIta are dependent on Prelude as they have arrows pointing towards the Prelude ellipse.
+
+http://www.grammaticalframework.org/lib/doc/rgl-tutorial/index.html
+
+The below graphic is an alternative graphic explaining the relations, taken from private correspondence with Inari.
+
+![File Hierarchy](FileHierarchy.png)
+
+CatLang defines the categories, and the modules AdjectiveLang, NounLang, SentenceLang, PhraseLang, and so on, all extend Cat. The Grammar is defined as a collection of all those AdjectiveLang, NounLang, SentenceLang, and so on modules. LangLang is defined as the collection GrammarLang and LexiconLang and is where you will be checking your program. You may ignore:
+
+- AllLangAbs, AllLang, ExtendLang, ExtraLangAbs, ExtraLang, ConstructionLang, DocumentationLang, MarkupLang, BackwardLang
+
+If the language you cloned from has any of these resource modules, you can remove them completely:
+
+-  IrregLang (unless you want to populate it with irregular verbs of your own language), MissingLang (see how to generate your own if you need it later: https://inariksit.github.io/gf/2018/08/28/gf-gotchas.html#generating-missingxxx)
+
+# Relationships between functions in files
+
+There may be several ways the functions within the files are organised relative to one another. In other words, there may be several schemas depending on the author. More recent RGLs might implement one schema detailed by this blog post by Inari.
+https://inariksit.github.io/gf/2018/08/28/gf-gotchas.html#my-naming-scheme-for-lincats-and-opers
+
+# Main goal
+
+You may think of your long-term goal as eventually implementing all the abstract functions found in the "abstract" folder. In other words, you are somewhat constrained by the available categories in Cat.gf and functions in relevant e.g. Noun.gf, Verb.gf etc. files. 
+
+In the future, if you find that the available functions do not apply to your language, you may search in the Extend.gf file for more optional functions, or in Extra.gf. if it doesn't exist, create your own ExtraLangAbs.gf with the concrete ExtraLang.gf, all in the same directory gf-rgl/src/lang. This blog post contains more information.
+
+https://inariksit.github.io/gf/2021/02/15/rgl-api-core-extensions.html#language-specific-extra-modules
+
+There is a prioritised list of RGL functions for new resource grammars written by contributor heatherleaf. You can start by implementing the "+++" functions.
+
+https://github.com/GrammaticalFramework/gf-rgl/issues/238
+
+# Working pipeline example
+
+For a pipeline, You might wish to start with implementing functions that create Noun Phrase like DetCN: Det -> CN -> NP; a function that takes a Determiner and a Common Noun and gives a Noun Phrase. In this case, the workflow is done by editing:
+
+1. ResLang: Contains the relevant Operations (Opers) for e.g. "Noun", "mkN",  "Determiner" and "Quant".
+2. ParamLang: Contains the language paramters used in ResLang.
+3. CatLang: CatLang will be defined in terms of Opers found in ResLang. This means that instead of Defining NP in CatLang as, say, {s: Str}, you will define NP as ResLang.NounPhrase, which points to a NounPhrase Oper in ResLang. Then you need to implement the word syntax in NounLang.
+4. NounLang: Contains the relevant lins in defining sentence structure.
+5. LexiconLang: Contains the lins that define the Noun words.
+
+As you will have to define a determiner that is created from a Quant, you will have to look at the following files too.
+
+6. StructuralLang: Contains the lins that define the Quant/Determiner words.
+
+Note that you will have to use mkQuant instead of creating Det by mkDet directly.
+
+# Testing your work
+
+When you are done with your implementation, you may test that everything works by starting up LangLang and, in this case, writing something like:
+
+```DetCN (DetQuant xxxx_Quant NumSg) (UseN xxxx_N)```
+
+Where you replace 'xxxx' with the word in Lang.

src/abstract/Construction.gf

@@ -39,6 +39,7 @@ fun
 
   n_units_AP    : Card -> CN -> A  -> AP ;  -- x inches long
   n_units_of_NP : Card -> CN -> NP -> NP ;  -- x ounces of this flour
+  n_unit_CN     : Card -> CN -> CN -> CN ;  -- x gallon bottle
 
 
 -- containers

src/abstract/Documentation.gf

@@ -13,6 +13,7 @@ fun
   InflectionN   : N -> Inflection ;
   InflectionN2  : N2 -> Inflection ;
   InflectionN3  : N3 -> Inflection ;
+  InflectionPN  : PN -> Inflection ;
   InflectionA   : A -> Inflection ;
   InflectionA2  : A2 -> Inflection ;
   InflectionV   : V -> Inflection ;
@@ -27,6 +28,9 @@ fun
   InflectionV2Q : V2Q -> Inflection ;
   InflectionV2A : V2A -> Inflection ;
   InflectionAdv : Adv -> Inflection ;
+  InflectionAdV : AdV -> Inflection ;
+  InflectionAdA : AdA -> Inflection ;
+  InflectionAdN : AdN -> Inflection ;
   InflectionPrep : Prep -> Inflection ;
 
 fun

src/abstract/Extend.gf

@@ -30,7 +30,7 @@ abstract Extend = Cat ** {
     StrandQuestSlash : IP -> ClSlash -> QCl ;   -- whom does John live with
     StrandRelSlash   : RP -> ClSlash -> RCl ;   -- that he lives in
     EmptyRelSlash    : ClSlash       -> RCl ;   -- he lives in
- 
+
 
 -- $VP$ conjunction, separate categories for finite and infinitive forms (VPS and VPI, respectively)
 -- covering both in the same category leads to spurious VPI parses because VPS depends on many more tenses
@@ -45,7 +45,15 @@ abstract Extend = Cat ** {
     MkVPS      : Temp -> Pol -> VP -> VPS ;  -- hasn't slept
     ConjVPS    : Conj -> [VPS] -> VPS ;      -- has walked and won't sleep
     PredVPS    : NP   -> VPS -> S ;          -- she [has walked and won't sleep]
-    
+    SQuestVPS  : NP   -> VPS -> QS ;         -- has she walked
+    QuestVPS   : IP   -> VPS -> QS ;         -- who has walked
+    RelVPS     : RP   -> VPS -> RS ;         -- which won't sleep
+
+-- existentials that work in the absence of Cl
+    ExistS     : Temp -> Pol -> NP -> S ;    -- there was a party
+    ExistNPQS  : Temp -> Pol -> NP -> QS ;   -- was there a party
+    ExistIPQS  : Temp -> Pol -> IP -> QS ;   -- what was there
+
     MkVPI      : VP -> VPI ;                 -- to sleep (TODO: Ant and Pol)
     ConjVPI    : Conj -> [VPI] -> VPI ;      -- to sleep and to walk
     ComplVPIVV : VV   -> VPI -> VP ;         -- must sleep and walk
@@ -59,17 +67,26 @@ abstract Extend = Cat ** {
     [VPI2] {2} ;  -- to love, to hate
 
   fun
-    MkVPS2    : Temp -> Pol -> VPSlash -> VPS2 ;  -- has loved       
+    MkVPS2    : Temp -> Pol -> VPSlash -> VPS2 ;  -- has loved
     ConjVPS2  : Conj -> [VPS2] -> VPS2 ;          -- has loved and now hates
     ComplVPS2 : VPS2 -> NP -> VPS ;               -- has loved and now hates that person
+    ReflVPS2  : VPS2 -> RNP -> VPS ;              -- have loved and now hate myself and my car
 
-    MkVPI2    : VPSlash -> VPI2 ;                 -- to love       
+    MkVPI2    : VPSlash -> VPI2 ;                 -- to love
     ConjVPI2  : Conj -> [VPI2] -> VPI2 ;          -- to love and hate
     ComplVPI2 : VPI2 -> NP -> VPI ;               -- to love and hate that person
 
+-- Conjunction of copula complements
+  cat [Comp]{2} ;
+  fun ConjComp : Conj -> ListComp -> Comp ;
+
+-- Conjunction of imperatives
+  cat [Imp] {2} ;
+  fun ConjImp : Conj -> ListImp -> Imp ;
+
   fun
     ProDrop : Pron -> Pron ;  -- unstressed subject pronoun becomes empty: "am tired"
-    
+
     ICompAP : AP -> IComp ;   -- "how old"
     IAdvAdv : Adv -> IAdv ;   -- "how often"
 
@@ -88,15 +105,15 @@ abstract Extend = Cat ** {
   -- participle constructions
     PresPartAP    : VP -> AP ;   -- (the man) looking at Mary
     EmbedPresPart : VP -> SC ;   -- looking at Mary (is fun)
-    
+
     PastPartAP      : VPSlash -> AP ;         -- lost (opportunity) ; (opportunity) lost in space
     PastPartAgentAP : VPSlash -> NP -> AP ;   -- (opportunity) lost by the company
-   
+
 -- this is a generalization of Verb.PassV2 and should replace it in the future.
 
     PassVPSlash : VPSlash -> VP ; -- be forced to sleep
 
--- the form with an agent may result in a different linearization 
+-- the form with an agent may result in a different linearization
 -- from an adverbial modification by an agent phrase.
 
     PassAgentVPSlash : VPSlash -> NP -> VP ;  -- be begged by her to go
@@ -105,6 +122,15 @@ abstract Extend = Cat ** {
 
     NominalizeVPSlashNP : VPSlash -> NP -> NP ;
 
+-- counterpart to ProgrVP, for VPSlash
+
+    ProgrVPSlash : VPSlash -> VPSlash;
+
+-- construct VPSlash from A2 and N2
+
+    A2VPSlash : A2 -> VPSlash ; -- is married to (that person)
+    N2VPSlash : N2 -> VPSlash ; -- is a mother of (that person)
+
 -- existential for mathematics
 
     ExistsNP : NP -> Cl ;  -- there exists a number / there exist numbers
@@ -115,6 +141,10 @@ abstract Extend = Cat ** {
     ExistMassCN   : CN -> Cl ;  -- there is beer / there is no beer
     ExistPluralCN : CN -> Cl ;  -- there are trees / there are no trees
 
+-- generalisation of existential, with adverb as an argument
+    AdvIsNP : Adv -> NP -> Cl ;  -- here is the tree / here are the trees
+    AdvIsNPAP : Adv -> NP -> AP -> Cl ; -- here are the instructions documented
+
 -- infinitive for purpose AR 21/8/2013
 
     PurposeVP : VP -> Adv ;  -- to become happy
@@ -134,13 +164,23 @@ abstract Extend = Cat ** {
 
 -- proper structure of "it is AP to VP"
 
-    PredAPVP : AP -> VP -> Cl ;   -- it is good to walk
+    PredAPVP : AP -> VP -> Cl ;      -- it is good to walk
 
 -- to use an AP as CN or NP without CN
 
     AdjAsCN : AP -> CN ;   -- a green one ; en grön (Swe)
     AdjAsNP : AP -> NP ;   -- green (is good)
 
+-- infinitive complement for IAdv
+
+    PredIAdvVP : IAdv -> VP -> QCl ; -- how to walk?
+
+-- alternative to EmbedQS. For English, EmbedQS happens to work,
+-- because "what" introduces question and relative. The default linearization
+-- could be e.g. "the thing we did (was fun)".
+
+    EmbedSSlash : SSlash -> SC  ;   -- what we did (was fun)
+
 -- reflexive noun phrases: a generalization of Verb.ReflVP, which covers just reflexive pronouns
 -- This is necessary in languages like Swedish, which have special reflexive possessives.
 -- However, it is also needed in application grammars that want to treat "brush one's teeth" as a one-place predicate.
@@ -148,8 +188,8 @@ abstract Extend = Cat ** {
   cat
     RNP ;     -- reflexive noun phrase, e.g. "my family and myself"
     RNPList ; -- list of reflexives to be coordinated, e.g. "my family, myself, everyone"
-    
--- Notice that it is enough for one NP in RNPList to be RNP. 
+
+-- Notice that it is enough for one NP in RNPList to be RNP.
 
   fun
     ReflRNP : VPSlash -> RNP -> VP ;   -- love my family and myself
@@ -159,15 +199,27 @@ abstract Extend = Cat ** {
 
     PredetRNP : Predet -> RNP -> RNP ; -- all my brothers
 
+    AdvRNP : NP -> Prep -> RNP -> RNP ;   -- a dispute with his wife
+    AdvRVP : VP -> Prep -> RNP -> VP ;    -- lectured about her travels
+    AdvRAP : AP -> Prep -> RNP -> AP ;    -- adamant in his refusal
+
+    ReflA2RNP : A2 -> RNP -> AP ;         -- indifferent to their surroundings
+                                               -- NOTE: generalizes ReflA2
+
+    PossPronRNP : Pron -> Num -> CN -> RNP -> NP ; -- his abandonment of his wife and children
+
     ConjRNP : Conj -> RNPList -> RNP ;  -- my family, John and myself
 
-    Base_rr_RNP : RNP -> RNP -> RNPList ;       -- my family, myself 
+    Base_rr_RNP : RNP -> RNP -> RNPList ;       -- my family, myself
     Base_nr_RNP : NP  -> RNP -> RNPList ;       -- John, myself
     Base_rn_RNP : RNP -> NP  -> RNPList ;       -- myself, John
     Cons_rr_RNP : RNP -> RNPList -> RNPList ;   -- my family, myself, John
     Cons_nr_RNP : NP  -> RNPList -> RNPList ;   -- John, my family, myself
 ----    Cons_rn_RNP : RNP -> ListNP  -> RNPList ;   -- myself, John, Mary
 
+-- reflexive possessive on its own right, like in Swedish, Czech, Slovak
+
+    ReflPossPron : Quant ;  -- Swe sin,sitt,sina
 
 --- from Extensions
 
@@ -181,8 +233,8 @@ abstract Extend = Cat ** {
   GerundNP    : VP -> NP ;          -- publishing the document (by nature definite)
   GerundAdv   : VP -> Adv ;         -- publishing the document (prepositionless adverb)
 
-  WithoutVP   : VP -> Adv ;         -- without publishing the document  
-  ByVP        : VP -> Adv ;         -- by publishing the document  
+  WithoutVP   : VP -> Adv ;         -- without publishing the document
+  ByVP        : VP -> Adv ;         -- by publishing the document
   InOrderToVP : VP -> Adv ;         -- (in order) to publish the document
 
   ApposNP : NP -> NP -> NP ;        -- Mr Macron, the president of France,
@@ -206,6 +258,10 @@ abstract Extend = Cat ** {
   DetNPMasc : Det -> NP ;
   DetNPFem  : Det -> NP ;
 
+  UseComp_estar : Comp -> VP ; -- (Cat, Spa, Por) "está cheio" instead of "é cheio"
+
+  SubjRelNP : NP -> RS -> NP ; -- Force RS in subjunctive: lo que les *resulte* mejor
+
   iFem_Pron      : Pron ; -- I (Fem)
   youFem_Pron    : Pron ; -- you (Fem)
   weFem_Pron     : Pron ; -- we (Fem)
@@ -222,4 +278,18 @@ abstract Extend = Cat ** {
   UttDatIP : IP -> Utt ; -- whom (dative)
 
 
+-- UseDAP replaces DetNP from the RGL which is more limited.
+-- Instead of (DetNP d) use (UseDAP (DetDAP d)). The advantage
+-- is that now we can also have an adjective inserted, i.e.
+-- (UseDAP (AdjDAP (DetDAP d) a). There are also versions of
+-- UseDAP for different genders.
+fun UseDAP     : DAP -> NP ;
+    UseDAPMasc : DAP -> NP ;
+    UseDAPFem  : DAP -> NP ;
+
+cat X ; -- for words that are difficult to classify, mainly for MorphoDict
+
+fun
+  CardCNCard : Card -> CN -> Card ;  -- three million, four lakh, six dozen etc
+
 }

src/abstract/Sentence.gf

@@ -40,6 +40,7 @@ abstract Sentence = Cat ** {
 -- To fix these parameters, see [Phrase Phrase.html].
 
     ImpVP     : VP -> Imp ;              -- love yourselves
+    AdvImp : Adv -> Imp -> Imp ;         -- please love yourselves
 
 --2 Embedded sentences
 

src/abstract/Terminology.gf

@@ -17,6 +17,10 @@ fun
   verb_Category        : Category ;
   adverb_Category      : Category ;
   preposition_Category : Category ;
+  numeral_Category     : Category ;
+  pronoun_Category     : Category ;
+  determiner_Category  : Category ;
+  article_Category  : Category ;
 
   number_ParameterType : ParameterType ;
   gender_ParameterType : ParameterType ;
@@ -65,6 +69,7 @@ fun
 
   active_Parameter : Parameter ;
   passive_Parameter : Parameter ;
+  middle_Parameter : Parameter ;
 
   present_Parameter : Parameter ;
   past_Parameter : Parameter ;
@@ -99,6 +104,9 @@ fun
   short_Parameter : Parameter ;   -- short form of e.g. a Fin infinitive
   long_Parameter : Parameter ;    
 
+  strong_Parameter : Parameter ;  -- German adjective declensions
+  weak_Parameter : Parameter ;
+
   finite_Modifier : Modifier ;
   transitive_Modifier : Modifier ;
   nominal_Modifier : Modifier ;

src/afrikaans/DocumentationAfr.gf

@@ -0,0 +1,153 @@
+--# -path=.:../abstract:../common
+
+concrete DocumentationAfr of Documentation = CatAfr ** open 
+  ResAfr,
+  Prelude,
+  HTML
+in {
+
+
+lincat
+  Inflection = {t : Str; s1,s2 : Str} ;
+  Definition = {s : Str} ;
+  Document = {s : Str} ;
+  Tag = {s : Str} ;
+
+lin
+  InflectionN, InflectionN2, InflectionN3 = \noun -> {
+    t  = "s" ;
+    s1 = heading1 "Selfstandige Naamwoord" ;
+    s2 = frameTable ( 
+           tr (th "Enkelvoud"            ++ th "Meervoud"   ) ++
+           tr (td (noun.s ! NF Sg Nom) ++ td (noun.s ! NF Pl Nom)))
+    } ;
+
+  InflectionPN = \pn -> {
+    t  = "pn" ;
+    s1 = heading1 "Naam" ;
+    s2 = paragraph (pn.s ! NPNom)
+    } ;
+
+  InflectionA, InflectionA2 = \adj ->
+    let
+      gforms : AForm -> Str = \a ->
+        td (adj.s ! Posit  ! a) ++
+        td (adj.s ! Compar ! a) ++
+        case a of {
+          AGen => td "-" ;    -- superlative partitive not used
+          _ => td (adj.s ! Superl ! a)
+          } ;
+      dtable : Str = 
+        frameTable ( 
+          tr (th []  ++ th "Stellend" ++ th "Vergrotend" ++ 
+                        th "Oortreffend") ++
+          tr (th "Predikatief" ++ gforms APred) ++
+          tr (th "Attributief" ++ gforms AAttr) ++
+          tr (th "Partitief"   ++ gforms AGen)
+          )
+    in { t  = "bv" ;
+         s1 = heading1 "Byvoeglike naamwoord" ;
+         s2 = dtable
+       } ;
+
+  InflectionAdv, InflectionAdV, InflectionAdA, InflectionAdN = \adv -> {
+    t  = "bw" ;
+    s1 = heading1 "Bywoord" ;
+    s2 = paragraph adv.s
+    } ;
+
+  InflectionPrep p = {
+    t  = "prep" ;
+    s1 = heading1 "Voorsetsel" ;
+    s2 = paragraph p.s
+    } ;
+
+  InflectionV v = {
+    t  = "w" ;
+    s1 = heading1 "Werkwoord" ;
+    s2 = inflVerb v
+    } ;
+
+  InflectionV2 v = {
+    t  = "v" ;
+    s1 = heading1 "Werkwoord" ;
+    s2 = inflVerb v
+    } ;
+
+  InflectionV3 v = {
+    t  = "v" ;
+    s1 = heading1 "Werkwoord" ;
+    s2 = inflVerb v
+    } ;
+
+  InflectionV2V v = {
+    t  = "v" ;
+    s1 = heading1 "Werkwoord" ;
+    s2 = inflVerb v
+    } ;
+
+  InflectionV2S v = {
+    t  = "v" ;
+    s1 = heading1 "Werkwoord" ;
+    s2 = inflVerb v
+    } ;
+
+  InflectionV2Q v = {
+    t  = "v" ;
+    s1 = heading1 "Werkwoord" ;
+    s2 = inflVerb v
+    } ;
+
+  InflectionV2A v = {
+    t  = "v" ;
+    s1 = heading1 "Werkwoord" ;
+    s2 = inflVerb v
+    } ;
+
+  InflectionVV v = {
+    t  = "v" ;
+    s1 = heading1 "Werkwoord" ;
+    s2 = inflVerb v
+    } ;
+
+  InflectionVS v = {
+    t  = "v" ;
+    s1 = heading1 "Werkwoord" ;
+    s2 = inflVerb v
+    } ;
+
+  InflectionVQ v = {
+    t  = "v" ;
+    s1 = heading1 "Werkwoord" ;
+    s2 = inflVerb v
+    } ;
+
+  InflectionVA v = {
+    t  = "v" ;
+    s1 = heading1 "Werkwoord" ;
+    s2 = inflVerb v
+    } ;
+
+lin
+  NoDefinition   t     = {s=t.s};
+  MkDefinition   t d   = {s="<p><b>Definisie:</b>"++t.s++d.s++"</p>"};
+  MkDefinitionEx t d e = {s="<p><b>Definisie:</b>"++t.s++d.s++"</p><p><b>Voorbeeld:</b>"++e.s++"</p>"};
+
+  MkDocument d i e = ss (i.s1 ++ d.s ++ i.s2 ++ paragraph e.s) ;  -- explanation appended in a new paragraph
+  MkTag i = ss i.t ;
+
+oper 
+  inflVerb : VVerb -> Str = \verb -> 
+     let 
+       vfin : VForm -> Str = \f ->
+         verb.s ! f ++ verb.prefix ; 
+       gforms : VForm -> Str = \f -> 
+         td (vfin f) ;
+
+     in frameTable (
+          tr (th "Infinitief"       ++ td (verb.s ! VInf)) ++
+          tr (th "Teenwoordige Tyd" ++ td (verb.s ! VPres)) ++
+          tr (th "Verlede Tyd"      ++ td (verb.s ! VPast)) ++
+          tr (th "Perfectief"       ++ td (verb.s ! VPerf))
+        ) ;
+}

src/afrikaans/LangAfr.gf

@@ -2,4 +2,6 @@
 
 concrete LangAfr of Lang = 
   GrammarAfr,
-  LexiconAfr ;
+  LexiconAfr
+  ,DocumentationAfr --# notpresent
+ ;

src/api/CombinatorsCze.gf

@@ -0,0 +1,9 @@
+--# -path=.:alltenses:prelude
+
+resource CombinatorsCze = Combinators with 
+  (Cat = CatCze),
+  (Structural = StructuralCze),
+  (Constructors = ConstructorsCze)
+    ** open MissingCze in {}
+    
+

src/api/CombinatorsHun.gf

@@ -0,0 +1,7 @@
+--# -path=.:alltenses:prelude:src/hungarian
+
+resource CombinatorsHun = Combinators with
+  (Cat = CatHun),
+  (Structural = StructuralHun),
+  (Noun = NounHun),
+  (Constructors = ConstructorsHun) ** open MissingHun in {}  ;

src/api/CombinatorsKor.gf

@@ -0,0 +1,7 @@
+--# -path=.:alltenses:prelude:../korean
+
+resource CombinatorsKor = Combinators with
+  (Cat = CatKor),
+  (Structural = StructuralKor),
+  (Noun = NounKor),
+  (Constructors = ConstructorsKor) ** open MissingKor in {}  ;

src/api/CombinatorsMay.gf

@@ -0,0 +1,8 @@
+--# -path=.:alltenses:prelude
+
+resource CombinatorsMay = Combinators - [ appCN, appCNc ] with 
+  (Cat = CatMay),
+  (Structural = StructuralMay),
+  (Noun = NounMay),
+  (Constructors = ConstructorsMay) ** 
+  {}

src/api/CombinatorsSlo.gf

@@ -0,0 +1,9 @@
+--# -path=.:alltenses:prelude
+
+resource CombinatorsSlo = Combinators with 
+  (Cat = CatSlo),
+  (Structural = StructuralSlo),
+  (Constructors = ConstructorsSlo)
+    ** open MissingSlo in {}
+    
+

src/api/CombinatorsTam.gf

@@ -0,0 +1,9 @@
+--# -path=.:alltenses:prelude
+
+resource CombinatorsTam = Combinators - [ appCN, appCNc ] with 
+  (Cat = CatTam),
+  (Structural = StructuralTam),
+  (Noun = NounTam),
+  (Constructors = ConstructorsTam) ** 
+  {}
+}

src/api/CombinatorsTur.gf

@@ -0,0 +1,9 @@
+--# -path=.:alltenses:prelude
+
+resource CombinatorsTur = Combinators with 
+  (Cat = CatTur),
+  (Structural = StructuralTur),
+  (Noun = NounTur),
+  (Constructors = ConstructorsTur) ** 
+{
+}

src/api/Constructors.gf

@@ -1180,6 +1180,8 @@ incomplete resource Constructors = open Grammar in {  --%
       = \a,p -> TUseQCl TPres a p ; --%
       mkQS : (Tense) -> (Ant) -> (Pol) -> QCl -> QS -- who wouldn't have slept
       = TUseQCl ; --%
+      mkQS : Temp -> Pol -> QCl -> QS -- who wouldn't have slept  --%
+      = UseQCl ; --%
 
 -- Since 'yes-no' question clauses can be built from clauses (see below),
 -- we give a shortcut

src/api/ConstructorsCze.gf

@@ -0,0 +1,5 @@
+--# -path=.:alltenses:prelude
+
+resource ConstructorsCze = Constructors with (Grammar = GrammarCze)
+  ** open MissingCze in {}
+

src/api/ConstructorsHun.gf

@@ -0,0 +1,3 @@
+--# -path=.:alltenses:prelude:../hungarian
+
+resource ConstructorsHun = Constructors with (Grammar = GrammarHun) ** open MissingHun in {} ;

src/api/ConstructorsKor.gf

@@ -0,0 +1,3 @@
+--# -path=.:alltenses:prelude:../korean
+
+resource ConstructorsKor = Constructors with (Grammar = GrammarKor) ** open MissingKor in {} ;

src/api/ConstructorsLat.gf

@@ -1,4 +1,4 @@
 --# -path=.:alltenses:prelude:../latin
 
 resource ConstructorsLat = Constructors with (Grammar = GrammarLat)  **
- open MissingLat in {}
+ open MissingLat in {} ;

src/api/ConstructorsMay.gf

@@ -0,0 +1,4 @@
+--# -path=.:alltenses:prelude:../malay
+
+resource ConstructorsMay = Constructors with (Grammar = GrammarMay)  **
+ open MissingMay in {} ;

src/api/ConstructorsSlo.gf

@@ -0,0 +1,5 @@
+--# -path=.:alltenses:prelude
+
+resource ConstructorsSlo = Constructors with (Grammar = GrammarSlo)
+  ** open MissingSlo in {}
+

src/api/ConstructorsTam.gf

@@ -0,0 +1,5 @@
+--# -path=.:alltenses:prelude:../tamil
+
+resource ConstructorsTam = Constructors with (Grammar = GrammarTam)  **
+ open MissingTam in {} ;
+}

src/api/ConstructorsTur.gf

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

src/api/Symbolic.gf

@@ -6,8 +6,9 @@ incomplete resource Symbolic = open Symbol, Grammar, PredefCnc in {
     symb : overload {
       symb : Symb -> NP ;                      -- x
       symb : Str -> NP ;                       -- x
-      symb : Int -> NP ;                       -- 23
+      symb : Int -> NP ;                       -- 23 (is prime)
       symb : Float -> NP ;                     -- 0.99
+      symb : Int -> Card ;                     -- 23 (houses)
       symb : N  -> Digits -> NP ;              -- level 4
       symb : N  -> Card -> NP ;                -- level at least four
       symb : CN -> Card -> NP ;                -- advanced level at least four
@@ -45,6 +46,8 @@ incomplete resource Symbolic = open Symbol, Grammar, PredefCnc in {
                           = \i -> UsePN (IntPN i) ;
       symb : Float -> NP 
                           = \i -> UsePN (FloatPN i) ;
+      symb : Int -> Card
+                          = \s -> SymbNum (mkSymb s.s) ;
       symb : N -> Digits -> NP 
                           = \c,i -> CNNumNP (UseN c) (NumDigits i) ;
       symb : N -> Card -> NP 

src/api/SymbolicCze.gf

@@ -0,0 +1,6 @@
+--# -path=.:../czech:../common:../abstract:../prelude
+
+resource SymbolicCze = Symbolic with
+  (Symbol = SymbolCze),
+  (Grammar = GrammarCze)
+  ** open MissingCze in {}

src/api/SymbolicHun.gf

@@ -0,0 +1,5 @@
+--# -path=.:../hungarian:../common:../abstract:../prelude
+
+resource SymbolicHun = Symbolic with
+  (Symbol = SymbolHun),
+  (Grammar = GrammarHun) ** open MissingHun in {} ;

src/api/SymbolicKor.gf

@@ -0,0 +1,5 @@
+--# -path=.:../korean:../common:../abstract:../prelude
+
+resource SymbolicKor = Symbolic with
+  (Symbol = SymbolKor),
+  (Grammar = GrammarKor) ** open MissingKor in {} ;

src/api/SymbolicLat.gf

@@ -1,5 +1,5 @@
---# -path=.:../icelandic:../common:../abstract:../prelude
+--# -path=.:../latin:../common:../abstract:../prelude
 
 resource SymbolicLat = Symbolic with 
   (Symbol = SymbolLat),
-  (Grammar = GrammarLat) ;
+  (Grammar = GrammarLat) ** open MissingLat in {} ;

src/api/SymbolicMay.gf

@@ -0,0 +1,5 @@
+--# -path=.:../malay:../common:../abstract:../prelude
+
+resource SymbolicMay = Symbolic with
+  (Symbol = SymbolMay),
+  (Grammar = GrammarMay) ** open MissingMay in {} ;

src/api/SymbolicSlo.gf

@@ -0,0 +1,6 @@
+--# -path=.:../slovak:../common:../abstract:../prelude
+
+resource SymbolicSlo = Symbolic with
+  (Symbol = SymbolSlo),
+  (Grammar = GrammarSlo)
+  ** open MissingSlo in {}

src/api/SymbolicTam.gf

@@ -0,0 +1,6 @@
+--# -path=.:../tamil:../common:../abstract:../prelude
+
+resource SymbolicTam = Symbolic with
+  (Symbol = SymbolTam),
+  (Grammar = GrammarTam) ** open MissingTam in {} ;
+}

src/api/SyntaxCze.gf

@@ -0,0 +1,4 @@
+--# -path=.:./alltenses:../prelude
+
+instance SyntaxCze of Syntax = 
+  ConstructorsCze, CatCze, StructuralCze, CombinatorsCze ;

src/api/SyntaxHun.gf

@@ -0,0 +1,4 @@
+--# -path=.:alltenses:prelude:../hungarian
+
+instance SyntaxHun of Syntax =
+  ConstructorsHun, CatHun, StructuralHun, CombinatorsHun ;

src/api/SyntaxKor.gf

@@ -0,0 +1,5 @@
+--# -path=.:alltenses:prelude:../korean
+
+instance SyntaxKor of Syntax =
+  ConstructorsKor, CatKor, StructuralKor, CombinatorsKor **
+  open MissingKor in {} ;

src/api/SyntaxMay.gf

@@ -0,0 +1,5 @@
+--# -path=.:alltenses:prelude
+
+instance SyntaxMay of Syntax = 
+  ConstructorsMay, CatMay, StructuralMay, CombinatorsMay ;
+

src/api/SyntaxSlo.gf

@@ -0,0 +1,4 @@
+--# -path=.:./alltenses:../prelude
+
+instance SyntaxSlo of Syntax = 
+  ConstructorsSlo, CatSlo, StructuralSlo, CombinatorsSlo ;

src/api/SyntaxTam.gf

@@ -0,0 +1,6 @@
+--# -path=.:alltenses:prelude
+
+instance SyntaxTam of Syntax = 
+  ConstructorsTam, CatTam, StructuralTam, CombinatorsTam ;
+
+}

src/api/SyntaxTur.gf

@@ -0,0 +1,4 @@
+--# -path=.:alltenses:prelude
+
+instance SyntaxTur of Syntax = ConstructorsTur, CatTur, StructuralTur, CombinatorsTur ;
+

src/api/TryCze.gf

@@ -0,0 +1,13 @@
+--# -path=.:../czech:../common:../abstract:../prelude
+
+resource TryCze = SyntaxCze, LexiconCze, ParadigmsCze -[mkAdv, mkDet,mkQuant]** 
+  open (P = ParadigmsCze) in {
+
+-- oper
+
+--  mkAdv = overload SyntaxCze {
+--    mkAdv : Str -> Adv = P.mkAdv ;
+--  } ;
+
+}
+

src/api/TryEng.gf

@@ -1,6 +1,6 @@
 --# -path=.:../english:../common:../abstract:../prelude
 
-resource TryEng = SyntaxEng-[mkAdN], LexiconEng, ParadigmsEng - [mkAdv,mkAdN,mkOrd,mkQuant] ** 
+resource TryEng = SyntaxEng-[mkAdN], LexiconEng, ParadigmsEng - [mkAdv,mkAdN,mkOrd,mkQuant,mkVoc] **
   open (P = ParadigmsEng) in {
 
 oper

src/api/TryFin.gf

@@ -1,3 +1,8 @@
 --# -path=.:../finnish:../common:../abstract:../prelude
 
-resource TryFin = SyntaxFin, LexiconFin-[mkOrd], ParadigmsFin - [mkAdv,mkAdN,mkDet,mkQuant,mkPConj] ;
+resource TryFin =
+  SyntaxFin,
+  LexiconFin-[mkOrd],
+  ParadigmsFin - [mkAdv,mkAdN,mkDet,mkQuant,mkPConj],
+  MakeStructuralFin - [mkDet,mkIDet,mkConj,mkSubj]
+  ;

src/api/TryHun.gf

@@ -0,0 +1,3 @@
+--# -path=.:../hungarian:../common:../abstract:../prelude
+
+resource TryHun = SyntaxHun, LexiconHun, ParadigmsHun - [mkAdv] ;

src/api/TryKor.gf

@@ -0,0 +1,3 @@
+--# -path=.:../korean:../common:../abstract:../prelude
+
+resource TryKor = SyntaxKor, LexiconKor, ParadigmsKor - [mkAdv] ;

src/api/TryLat.gf

@@ -1,3 +1,3 @@
 --# -path=.:../latin:../common:../abstract:../prelude
 
-resource TryLat = SyntaxLat, LexiconLat, ParadigmsLat - [mkAdv,mkAdN,mkOrd] ;
+resource TryLat = SyntaxLat, LexiconLat, ParadigmsLat - [mkAdv,mkAdN,mkOrd,mkNum] ;

src/api/TryMay.gf

@@ -0,0 +1,3 @@
+--# -path=.:../malay:../common:../abstract:../prelude
+
+resource TryMay = SyntaxMay, LexiconMay, ParadigmsMay - [mkAdv,mkAdN,mkOrd,mkNum] ;

src/api/TryRus.gf

@@ -1,3 +1,3 @@
 --# -path=.:../russian:../common:../abstract:../prelude
 
-resource TryRus = SyntaxRus, LexiconRus, ParadigmsRus - [mkAdv] ;
+resource TryRus = SyntaxRus, LexiconRus, ParadigmsRus - [mkAdv,mkIAdv,mkOrd,mkAdN] ;

src/api/TrySlo.gf

@@ -0,0 +1,13 @@
+--# -path=.:../slovak:../common:../abstract:../prelude
+
+resource TrySlo = SyntaxSlo, LexiconSlo, ParadigmsSlo -[mkAdv, mkDet,mkQuant]** 
+  open (P = ParadigmsSlo) in {
+
+-- oper
+
+--  mkAdv = overload SyntaxSlo {
+--    mkAdv : Str -> Adv = P.mkAdv ;
+--  } ;
+
+}
+

src/api/TryTam.gf

@@ -0,0 +1,4 @@
+--# -path=.:../tamil :../common:../abstract:../prelude
+
+resource TryTam = SyntaxTam, LexiconTam, ParadigmsTam - [mkAdv,mkAdN,mkOrd,mkNum] ;
+}

src/api/TryTur.gf

@@ -0,0 +1,11 @@
+--# -path=.:../turkish:../common:../abstract:../prelude
+
+resource TryTur = SyntaxTur, LexiconTur, ParadigmsTur - [mkAdN,mkAdv,mkNum,mkQuant] **
+  open (P = ParadigmsTur), (R = ResTur) in {
+
+oper
+  mkAdv = overload SyntaxTur {
+    mkAdv : Str -> Adv = P.mkAdv ;
+  } ;
+
+}

src/arabic/AdjectiveAra.gf

@@ -3,7 +3,6 @@ concrete AdjectiveAra of Adjective = CatAra ** open ResAra, Prelude in {
  flags coding = utf8 ;
   lin
 
-
   PositA a = {
     s = \\h,g,n,d,c => case h of {
         Hum => a.s ! APosit g n d c;
@@ -23,25 +22,23 @@ concrete AdjectiveAra of Adjective = CatAra ** open ResAra, Prelude in {
   ComplA2 a np = {
     s = \\sp,g,n,st,c => a.s ! APosit g n st c ++ a.c2.s ++ bindIf a.c2.binds ++ np.s ! a.c2.c ;
     } ;
---
---    ReflA2 a = {
---      s = \\ag => a.s ! AAdj Posit ++ a.c2 ++ reflPron ! ag ;
---      isPre = False
---      } ;
---
---    SentAP ap sc = {
---      s = \\a => ap.s ! a ++ sc.s ;
---      isPre = False
---      } ;
---
-  AdAP ada ap = {
-    s = \\sp,g,n,st,c => ada.s ++ ap.s ! sp ! g ! n ! st ! c
+
+  -- full PerGenNum should be added to make this work properly
+  ReflA2 a = {
+    s = \\sp,g,n,st,c => a.s ! APosit g n st c ++ a.c2.s ++ reflPron c (gn2pgn {g=g;n=n})
     } ;
 
+  AdAP ada ap = {
+    s = \\sp,g,n,st,c => ap.s ! sp ! g ! n ! st ! c ++ ada.s
+    } ;
+
+  AdvAP,
+  SentAP = \ap,ss -> AdAP ss ap ;
+
   UseA2 = PositA ;
 
   UseComparA a = {
-    s = \\h,g,n,d,c => a.s ! AComp d c 
+    s = \\h,g,n,d,c => a.s ! AComp d c
     };
 
   -- : Ord -> AP ;       -- warmest

src/arabic/AdverbAra.gf

@@ -11,9 +11,9 @@ concrete AdverbAra of Adverb = CatAra ** open ResAra, Prelude in {
     --   s = cadv.s ++ a.s ! AAdv ++ "مِنْ" ++ s.s
     --   } ;
 
-    PrepNP prep np = {s = prep.s ++ bindIf prep.binds ++ np.s ! prep.c} ;
+    PrepNP prep np = {s = prep.s ++ bindIf (orB np.a.isPron prep.binds) ++ np.s ! prep.c} ;
 
-    AdAdv ad av = cc2 av ad ;
+    AdAdv ad av = cc2 ad av ;
 
     -- : Subj -> S -> Adv ;              -- when she sleeps
     SubjS subj s = {s = subj.s ++ s.s ! subj.o} ;

src/arabic/AllAra.gf

@@ -1,3 +1,3 @@
 --# -path=.:../abstract:../common:../api:../prelude
 
-concrete AllAra of AllAraAbs = LangAra ;
+concrete AllAra of AllAraAbs = LangAra, ExtendAra ;

src/arabic/AllAraAbs.gf

@@ -1,3 +1,3 @@
 --# -path=.:../abstract:../common:prelude
 
-abstract AllAraAbs = Lang ;
+abstract AllAraAbs = Lang, Extend ;

src/arabic/CatAra.gf

@@ -13,7 +13,7 @@ concrete CatAra of Cat = CommonX - [Utt]  ** open ResAra, Prelude, ParamX in {
     SSlash,
     S  = {s : Order => Str} ; -- subordinate clause has nominal word order and subject in acc
     QS = {s : QForm => Str} ;
-    RS = {s : Agr => Case => Str} ; -- case because the relative pronoun inflects in case
+    RS = {s : PerGenNum => Case => Str} ; -- case because the relative pronoun inflects in case
 
 -- Sentence
 
@@ -26,7 +26,7 @@ concrete CatAra of Cat = CommonX - [Utt]  ** open ResAra, Prelude, ParamX in {
     QCl = ResAra.QCl ; -- {s : Tense => Polarity => QForm => Str} ;
     IDet = ResAra.IDet ; -- {s : Gender => State => Case => Str ; n : Number} ;
     IP   = ResAra.IP ;   -- {s : (isPred : Bool) => State => Case => Str ; n : Number} ;
-    IComp = ResAra.IComp ; -- 
+    IComp = ResAra.IComp ; --
     IQuant = {s : State => Case => Str} ;
 
 -- Relative
@@ -70,19 +70,19 @@ concrete CatAra of Cat = CommonX - [Utt]  ** open ResAra, Prelude, ParamX in {
 
 -- Structural
 
-    Conj = {s : Str ; n : ResAra.Number} ;
---    DConj = {s1,s2 : Str ; n : ResAra.Number} ;
+    Conj = {s1,s2 : Str; n : ResAra.Number} ;
     Subj = {s : Str ; o : Order} ;
     Prep = ResAra.Preposition ;
 
 -- Open lexical classes, e.g. Lexicon
 
-    V, VS, VQ, VA = ResAra.Verb ; -- = {s : VForm => Str} ;
-    V2, V2A = ResAra.Verb2 ;
-    VV = ResAra.Verb2 ** {sc : Preposition} ; -- c2 is for verb
-    V2S, V2Q = ResAra.Verb2 ;
+    V, VQ, VA = ResAra.Verb ; -- = {s : VForm => Str} ;
+    VV = ResAra.Verb ** {s2 : Str ; sc : Preposition} ; -- s2 is complementiser
+    V2, V2A, V2Q = ResAra.Verb2 ;
+    V2V = ResAra.Verb2 ** {s2 : Str ; sc : Preposition} ; -- s2 is complementiser, c2 is for dir.obj
+    V2S = ResAra.Verb2 ** {s2 : Str ; o : Order} ;
+    VS = ResAra.Verb ** {s2 : Str ; o : Order} ;
     V3 = ResAra.Verb3 ;
-    V2V = ResAra.Verb3 ** {sc : Preposition} ; -- c3 is for verb, c2 is for dir.obj
 
     A = ResAra.Adj ;
     A2 = ResAra.Adj2 ;
@@ -96,6 +96,6 @@ linref
 
   CN = \cn -> uttCN cn ! Masc ;
   N = \n -> uttCN (useN n) ! Masc ;
-  VP = \vp -> uttVP vp ! Masc ;
+  VP = \vp -> uttVP VPPerf vp ! Masc ;
 
 }

src/arabic/ConjunctionAra.gf

@@ -1,11 +1,12 @@
-concrete ConjunctionAra of Conjunction = 
+concrete ConjunctionAra of Conjunction =
   CatAra ** open ResAra, Coordination, Prelude in {
 
 lincat
 
   [S] =  {s1,s2 : Order => Str} ;
   [Adv] = {s1,s2 : Str} ;
-  [NP] = {s1,s2 : Case => Str ; a : Agr ; empty : Str} ;
+  [NP] = {s1,s2 : Case => Str ; a : Agr ; empty : Str; isHeavy : Bool} ;
+  [CN] = {s1,s2 : NTable ; g : Gender ; h : Species ; isDual : Bool ; np : Case => Str ; isHeavy : Bool} ;
   [AP] = {s1,s2 : Species => Gender => Number => State => Case => Str} ;
 
 lin
@@ -13,32 +14,38 @@ lin
 
   BaseAdv = twoSS ;
   ConsAdv = consrSS comma ;
-  ConjAdv = conjunctSS ;
+  ConjAdv = conjunctDistrSS ;
 
   BaseS = twoTable Order ;
   ConsS = consrTable Order comma ;
-  ConjS = conjunctTable Order ;
+  ConjS = conjunctDistrTable Order ;
 
-  BaseNP x y = twoTable Case x y ** {
-    a = conjAgr x.a y.a ;
-    empty = []
+  BaseNP x y = emptyNP ** twoTable Case x y ** {
+    a = conjAgr x.a y.a
     } ;
-  ConsNP xs x = consrTable Case comma xs x ** {
-    a = conjAgr xs.a x.a ;
-    empty = []
+  ConsNP xs x = emptyNP ** consrTable Case comma xs x ** {
+    a = conjAgr xs.a x.a
     } ;
-  ConjNP conj ss = conjunctTable Case conj ss ** {
-    a = let gn = pgn2gn ss.a.pgn in 
-        {pgn = Per3 gn.g (conjNumber conj.n gn.n) ; isPron = False} ;
-    empty = []
+  ConjNP conj ss = emptyNP ** conjunctDistrTable Case conj ss ** {
+    a = let gn = pgn2gn ss.a.pgn in
+        {pgn = Per3 gn.g (conjNumber conj.n gn.n) ; isPron = False}
     } ;
 
   BaseAP = twoTable5 Species Gender Number State Case ;
   ConsAP = consrTable5 Species Gender Number State Case comma ;
-  ConjAP = conjunctTable5 Species Gender Number State Case ;
+  ConjAP = conjunctDistrTable5 Species Gender Number State Case ;
+
+  BaseCN cn1 cn2  = leanCN cn1 ** twoTable3 Number State Case (leanCN cn1) (leanCN cn2) ;
+  ConsCN cn cns   = leanCN cn ** consrTable3 Number State Case comma (leanCN cn) cns ;
+  ConjCN conj cns = cns ** conjunctDistrTable3 Number State Case conj cns ;
 
 
 oper
+  leanCN : CN -> CN = \cn -> cn ** {
+    np = \\_ => [] ;
+    s = \\n,s,c => cn2str cn n s c
+    } ;
+
   conjAgr : Agr -> Agr -> Agr = \a,b -> {
     isPron = False ;
     pgn = let gnA = pgn2gn a.pgn ; gnB = pgn2gn b.pgn in
@@ -53,30 +60,25 @@ oper
 
   -- move to predef?
 
-  ListTable5 : PType -> PType -> PType -> PType -> PType -> Type = \P,Q,R,T,S -> 
-    {s1,s2 : P => Q => R => T => S => Str} ; 
+  ListTable5 : PType -> PType -> PType -> PType -> PType -> Type = \P,Q,R,T,S ->
+    {s1,s2 : P => Q => R => T => S => Str} ;
 
-  twoTable5 : (P,Q,R,T,S : PType) -> (_,_ : {s : P => Q => R => T => S => Str}) -> 
-              ListTable5 P Q R T S = 
+  twoTable5 : (P,Q,R,T,S : PType) -> (_,_ : {s : P => Q => R => T => S => Str}) ->
+              ListTable5 P Q R T S =
     \_,_,_,_,_,x,y ->
-    {s1 = x.s ; s2 = y.s} ; 
+    {s1 = x.s ; s2 = y.s} ;
 
-  consrTable5 : 
-    (P,Q,R,T,S : PType) -> Str -> {s : P => Q => R => T => S => Str} -> 
+  consrTable5 :
+    (P,Q,R,T,S : PType) -> Str -> {s : P => Q => R => T => S => Str} ->
        ListTable5 P Q R T S -> ListTable5 P Q R T S =
      \P,Q,R,T,S,c,x,xs ->
-    {s1 = \\p,q,r,t,s => xs.s1 ! p ! q ! r ! t ! s ++ c ++ xs.s2 ! p ! q ! r ! t ! s ; 
+    {s1 = \\p,q,r,t,s => xs.s1 ! p ! q ! r ! t ! s ++ c ++ xs.s2 ! p ! q ! r ! t ! s ;
      s2 = x.s
-    } ; 
+    } ;
 
-  conjunctTable5 : 
-    (P,Q,R,T,S : PType) -> Conjunction -> ListTable5 P Q R T S -> {s : P => Q => R => T => S => Str} = 
+  conjunctDistrTable5 :
+    (P,Q,R,T,S : PType) -> ConjunctionDistr -> ListTable5 P Q R T S ->
+       {s : P => Q => R => T => S => Str} =
     \P,Q,R,T,S,or,xs ->
-    {s = \\p,q,r,t,s => xs.s1 ! p ! q ! r ! t ! s ++ or.s ++ xs.s2 ! p ! q ! r ! t ! s} ;
-
-  -- conjunctDistrTable5 : 
-  --   (P,Q,R,T,S : PType) -> ConjunctionDistr -> ListTable5 P Q R T S -> 
-  --      {s : P => Q => R => T => S => Str} = 
-  --   \P,Q,R,T,S,or,xs ->
-  --   {s = \\p,q,r,t,s => or.s1++ xs.s1 ! p ! q ! r ! t ! s ++ or.s2 ++ xs.s2 ! p ! q ! r ! t ! s} ;
+    {s = \\p,q,r,t,s => or.s1++ xs.s1 ! p ! q ! r ! t ! s ++ or.s2 ++ xs.s2 ! p ! q ! r ! t ! s} ;
 }

src/arabic/ConstructionAra.gf

@@ -1,4 +1,4 @@
-concrete ConstructionAra of Construction = CatAra ** open 
+concrete ConstructionAra of Construction = CatAra ** open
   Prelude,
   ParadigmsAra,
   SyntaxAra,
@@ -7,7 +7,7 @@ concrete ConstructionAra of Construction = CatAra ** open
   (E=ExtendAra),
   (R=ResAra),
   (L=LexiconAra) in {
-	
+
 lincat
   Timeunit = N ;
   Weekday = N ;
@@ -17,18 +17,25 @@ lincat
 
 lin
 
-  timeunitAdv n time = 
+  timeunitAdv n time =
   let n_card : Card   = n ;
       n_hours_NP : NP = mkNP n_card time ;
   in  SyntaxAra.mkAdv during_Prep n_hours_NP | ParadigmsAra.mkAdv (n_hours_NP.s ! R.Nom) ;
 
-  -- random guesses
-  weekdayPunctualAdv w = SyntaxAra.mkAdv on_Prep (mkNP w) ;         -- on Sunday
-  weekdayHabitualAdv w = SyntaxAra.mkAdv on_Prep (mkNP w) ;         -- on Sundays
-  weekdayNextAdv w = SyntaxAra.mkAdv on_Prep (mkNP w) ;      -- next Sunday
-  weekdayLastAdv w = SyntaxAra.mkAdv on_Prep (mkNP w) ;     -- last Sunday
+  weekdayPunctualAdv w = ParadigmsAra.mkAdv ((mkNP w).s ! R.Nom) ;  -- on Sunday
+--  weekdayPunctualAdv w = SyntaxAra.mkAdv noPrep (mkNP w) ;  -- on Sunday
+  -- TODO
+  weekdayHabitualAdv,                    -- on Sundays
+  weekdayNextAdv,                        -- next Sunday
+  weekdayLastAdv = weekdayPunctualAdv ;  -- last Sunday
+
+  monthAdv january =
+    let january_CN : CN = mkCN month_Timeunit (mkNP (mkPN january)) ;
+        january_NP : 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 ;
 
-  monthAdv m = SyntaxAra.mkAdv in_Prep (mkNP m) ;
   yearAdv y = SyntaxAra.mkAdv in_Prep y ;
 
   -- dummy
@@ -39,34 +46,51 @@ lin
   intYear = symb ;
   intMonthday = symb ;
 
---  n_units_AP
-
+  -- : Card -> CN -> A -> AP
+  n_units_AP card cn a =
+    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
+        ++ (mkNP card cn).s ! R.Bare ---- ? /IL
+      } ;
 
 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 ;
 
 lin
   -- : NP -> NP -> Cl
-  have_name_Cl np nm = 
+  have_name_Cl np nm =
     let subjPron : 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 = 
+  what_name_QCl np =
     let subjPron : 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 ;
      in mkQCl what_IP myName ;
 
---  how_old_QCl
+  how_old_QCl np =
+    let subjPron : 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) ;
+     in mkQCl what_IP myAge ;
 
---  hungry_VP =
---  thirsty_VP =
+  hungry_VP = mkVP hungry_A ;
+  thirsty_VP = mkVP thirsty_A ;
 
+oper
+  hungry_A = mkA "جءع" "فَاعِل" ;
+  thirsty_A = mkA True "عطش" "فَعْلَان" "فَعْلَى" ;
 lincat Language = N ;
 
 lin InLanguage l = mkAdv in_Prep (mkNP l) ;
@@ -91,31 +115,31 @@ oper mkLanguage : Str -> N = mkN ;
 lin second_Timeunit = mkN "second" ;
 lin minute_Timeunit = mkN "minute" ;
 lin hour_Timeunit = mkN "hour" ;
-lin day_Timeunit = mkN "day" ;
+lin day_Timeunit = mkN "يَوْم" ;
 lin week_Timeunit = mkN "week" ;
-lin month_Timeunit = mkN "month" ;
+lin month_Timeunit = mkN "شَهْر" "أَشْهُر" masc nohum ;
 lin year_Timeunit = mkN "year" ;
 
-lin monday_Weekday = mkN "Monday" ;
-lin tuesday_Weekday = mkN "Tuesday" ;
-lin wednesday_Weekday = mkN "Wednesday" ;
-lin thursday_Weekday = mkN "Thursday" ;
-lin friday_Weekday = mkN "Friday" ;
-lin saturday_Weekday = mkN "Saturday" ;
-lin sunday_Weekday = mkN "Sunday" ;
+lin monday_Weekday = mkN day_Timeunit (mkN "إثْنَيْن") ;
+lin tuesday_Weekday = mkN day_Timeunit (mkN "ثُلَاثَاء") ;
+lin wednesday_Weekday = mkN day_Timeunit (mkN "أَرْبَعَاء") ;
+lin thursday_Weekday = mkN day_Timeunit (mkN "خَمِيس") ;
+lin friday_Weekday = mkN day_Timeunit (mkN "جُمْعَة") ;
+lin saturday_Weekday = mkN day_Timeunit (mkN "سَبْت") ;
+lin sunday_Weekday = mkN day_Timeunit (mkN "أَحَد") ;
 
-lin january_Month = mkN "January" ; 
-lin february_Month = mkN "February" ; 
-lin march_Month = mkN "March" ; 
-lin april_Month = mkN "April" ;
-lin may_Month = mkN "May" ;
-lin june_Month = mkN "June" ;
-lin july_Month = mkN "July" ;
-lin august_Month = mkN "August" ;
-lin september_Month = mkN "September" ;
-lin october_Month = mkN "October" ;
-lin november_Month = mkN "November" ;
-lin december_Month = mkN "December" ;
+lin january_Month = mkN (mkN "كَانُون") (mkAP (mkOrd (mkNumeral n2_Unit))) ;
+lin february_Month = mkN "شُبَاط" ;
+lin march_Month = mkN "آذَار" ;
+lin april_Month = mkN "نَيْسَان" ;
+lin may_Month = mkN "أَيَّار" ;
+lin june_Month = mkN "حَزِيرَان" ;
+lin july_Month = mkN "تَمُّوز" ;
+lin august_Month = mkN "آب" ;
+lin september_Month = mkN "أَيْلُول" ;
+lin october_Month = mkN (mkN "تِشْرِين") (mkAP (mkOrd (mkNumeral n1_Unit))) ;
+lin november_Month = mkN (mkN "تِشْرِين") (mkAP (mkOrd (mkNumeral n2_Unit))) ;
+lin december_Month = mkN (mkN "كَانُون") (mkAP (mkOrd (mkNumeral n1_Unit))) ;
 
 -- lin afrikaans_Language = mkLanguage "Afrikaans" ;
 -- lin amharic_Language = mkLanguage "Amharic" ;
@@ -140,7 +164,7 @@ lin finnish_Language = mkLanguage "فِنْلَنْدِيّة" ;
 -- lin maltese_Language = mkLanguage "Maltese" ;
 -- lin nepali_Language = mkLanguage "Nepali" ;
 -- lin norwegian_Language = mkLanguage "Norwegian" ;
-lin nprsian_Language = mkLanguage "فَارِسيّة" ;
+lin persian_Language = mkLanguage "فَارِسيّة" ;
 -- lin polish_Language = mkLanguage "Polish" ;
 -- lin punjabi_Language = mkLanguage "Punjabi" ;
 -- lin romanian_Language = mkLanguage "Romanian" ;