Change build workflow to take care of creating entire release

Request for Merge

.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

.travis.yml

@@ -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

README.md

@@ -6,7 +6,7 @@
 
 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
 

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
 

Setup.sh

@@ -97,4 +97,4 @@ done
 
 # Copy
 echo "Copying to ${dest}"
-cp -R -p "${dist}"/* "${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

@@ -5,7 +5,7 @@ An abstract syntax:
 ```
   abstract Music = {
   cat
-    Kind, 
+    Kind ;
     Property ;
   fun
     PropKind : Kind -> Property -> Kind ;
@@ -23,7 +23,7 @@ A domain lexicon interface:
 ```
 A functor on ``Syntax`` and the domain lexicon interface:
 ```
-  incomplete concrete MusicI of Music = open Syntax, MusicLex in {
+  incomplete concrete MusicI of Music = open Syntax, LexMusic in {
   lincat
     Kind = CN ;
     Property = AP ;

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,17 +14,18 @@ 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
 Mlt,Maltese,maltese,,,,,,,,y
 Mon,Mongolian,mongolian,,,,,,n,,y
@@ -33,13 +36,15 @@ 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,,,n,n,n,n,n
 Swe,Swedish,swedish,Scand,,y,,,,y,y
 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

src/Lang.labels

@@ -8,17 +8,18 @@ FocusObjS 	nsubj head              -- again might be wrong; more correct to call
 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
+QuestSlash 	obj head
 QuestVP 	nsubj head
+IdetCN		det 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
 
@@ -84,8 +85,8 @@ 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
+IdetCN 	det head
+IdetQuant head nummod
 CountNP 	det head
 PredetNP 	det head
 PPartNP		head amod	-- only in core RGL
@@ -156,12 +157,12 @@ 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 dobj dobj
 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 

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

@@ -45,6 +45,13 @@ 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
+
+-- 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
@@ -105,6 +112,10 @@ abstract Extend = Cat ** {
 
     NominalizeVPSlashNP : VPSlash -> NP -> NP ;
 
+-- counterpart to ProgrVP, for VPSlash
+
+    ProgrVPSlash : VPSlash -> VPSlash;
+
 -- existential for mathematics
 
     ExistsNP : NP -> Cl ;  -- there exists a number / there exist numbers
@@ -115,6 +126,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 a parameter
+    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 +149,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.
@@ -206,6 +231,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)

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

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

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

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

src/api/ConstructorsTur.gf

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

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

@@ -0,0 +1,6 @@
+--# -path=.:../slovak:../common:../abstract:../prelude
+
+resource SymbolicSlo = Symbolic with
+  (Symbol = SymbolSlo),
+  (Grammar = GrammarSlo)
+  ** open MissingSlo 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/SyntaxSlo.gf

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

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/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/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] ;

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/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,21 +22,19 @@ 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 = {

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/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
 
@@ -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

@@ -5,7 +5,8 @@ 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 ** {
+  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} ;
-    empty = []
+        {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
@@ -69,14 +76,9 @@ oper
      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

@@ -22,13 +22,20 @@ lin
       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,10 +46,19 @@ 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 ;
 
@@ -62,11 +78,19 @@ lin
         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" ;

src/arabic/ExtendAra.gf

@@ -2,58 +2,88 @@
 
 concrete ExtendAra of Extend =
   CatAra ** ExtendFunctor - [
-    GenNP, SlashBareV2S, PredAPVP, GenModNP, ExistsNP,
-    StrandRelSlash, ExistPluralCN, ExistMassCN, ExistCN, EmptyRelSlash, DetNPMasc, DetNPFem,
-    ComplBareVS, ComplDirectVS, ComplDirectVQ,
-    ICompAP,
+    GenNP, ApposNP, ICompAP, DetNPMasc, DetNPFem,
+    EmptyRelSlash, PredAPVP,
+    ComplDirectVS, ComplDirectVQ, -- because of Utt
     VPS, MkVPS, PredVPS, BaseVPS, ConsVPS, ConjVPS,
-    ApposNP
+    EmbedSSlash, AdjAsNP
 ]
   with (Grammar=GrammarAra)
   ** open
 
-    ParamX,
     ResAra,
     Prelude,
+    ParadigmsAra,
+    RelativeAra,
     Coordination
 
   in {
 
-  lin
-    GenNP np = {s = \\_,_,_,_ => np.s ! Gen ; d = Const ; isNum,isPron,is1sg = False} ;
+lin
+  -- If the NP is a pronoun, just use PossPron
+  GenNP np = case np.a.isPron of {
+    True  => Grammar.PossPron (pgn2pron np.a.pgn) ;
+    False => let g = np.s ! Gen in mkQuant3 g g g Const
+  } ;
 
-    -- : NP -> NP -> NP
-    ApposNP np1 np2 = np2 ** {s = \\c => np1.s ! c ++ np2.s ! c} ;
+  -- : NP -> NP -> NP
+  ApposNP np1 np2 = np2 ** {s = \\c => np1.s ! c ++ np2.s ! c} ;
 
-    -- : AP -> IComp ;   -- "how old"
-    ICompAP ap = {s = \\gn => "كَمْ" ++ ap.s ! NoHum ! gn.g ! gn.n ! Indef ! Acc} ;
+  -- : AP -> IComp ;   -- "how old"
+  ICompAP ap = {s = \\gn => "كَمْ" ++ ap.s ! NoHum ! gn.g ! gn.n ! Indef ! Acc} ;
 
-  lincat
+  -- : AP -> VP -> Cl ;   -- it is good to walk
+  PredAPVP ap vp =
+    let isGood : Str = "مِنَ" ++ ap.s ! Hum ! Masc ! Sg ! Def ! Gen ;
+        toWalk : Str = "ال" ++ BIND ++ (uttVP VPGer vp ! Masc) ; -- TODO: Masdar into NForm=>Str?
+        goodToWalk_Adv : Adv = lin Adv {s = isGood ++ toWalk} ;
+     in PredVP emptyNP (UseComp (CompAdv goodToWalk_Adv)) ;
 
-    VPS   = {s : PerGenNum => Str} ;  -- finite VP's with tense and polarity
-    [VPS] = {s1,s2 : PerGenNum => Str} ;
-  lin
-    -- : Temp -> Pol -> VP -> VPS ; -- hasn't slept
-    MkVPS t p vp = {
-      s = \\pgn => let vps =
-        wordOrderNoSubj 
-          Nominal --  Nominal (=SVO) generalises best for ConjVPS.
-          vp.obj.a.isPron 
-          (vStr vp pgn t.t p.p Nominal)
-          (case <vp.isPred,vp.obj.a.isPron> of {
-                    <False,True> => BIND ++ vp.obj.s ;
-                    _            =>         vp.obj.s })
-          (pred vp pgn t.t p.p) 
-          vp.s2 
-      in vps.before ++ vps.after -- word order is SVO, so this is safe for just this case.
-      } ;
+  -- : Det -> NP
+  DetNPMasc det = emptyNP ** {s = det.s ! NoHum ! Masc} ;
+  DetNPFem det = emptyNP ** {s = det.s ! NoHum ! Fem} ;
 
-    BaseVPS = twoTable PerGenNum ;
-    ConsVPS = consrTable PerGenNum comma ;
-    ConjVPS = conjunctTable PerGenNum ;
+  -- : AP -> NP
+  AdjAsNP ap = 
+  let adjAsN : Noun = {
+        s = ap.s ! NoHum ! Masc ;
+        s2 = emptyNTable ;
+        g = Masc ;
+        h = NoHum ;
+        isDual = False } ;
+   in MassNP (UseN adjAsN) ;
 
-    PredVPS np vps = {
-      s = \\_ => np.s ! Nom ++ vps.s ! np.a.pgn -- first quick version with order always Nominal.
-      } ;                                       -- if necessary, change VPS into {s : PerGenNum => Order => {before,after : Str}}
+  -- : ClSlash -> RCl  -- he lives in
+  EmptyRelSlash = RelSlash (IdRP ** {s = \\_ => []}) ;
+
+  -- : SSlash -> SC
+  EmbedSSlash = Grammar.EmbedS ;
+
+lincat
+  VPS   = {s : PerGenNum => Str} ;  -- finite VP's with tense and polarity
+  [VPS] = {s1,s2 : PerGenNum => Str} ;
+lin
+  -- : Temp -> Pol -> VP -> VPS ; -- hasn't slept
+  MkVPS t p vp = {
+    s = \\pgn => let vps =
+      wordOrderNoSubj
+        Nominal --  Nominal (=SVO) generalises best for ConjVPS.
+        vp.obj.a.isPron
+        (vStr vp pgn t.t p.p Nominal)
+        vp.obj.s -- BIND is taken care of when the VP was made, no need to add one here
+        (pred vp pgn t.t p.p)
+        vp.s2
+    in vps.before ++ vps.after -- word order is SVO, so this is safe for just this case.
+    } ;
+
+  -- maybe more robust to use إِيَّا as object carrier if the VPS
+  -- consists of several VPSs; like it's done in Slash3V3 /IL
+  BaseVPS = twoTable PerGenNum ;
+  ConsVPS = consrTable PerGenNum comma ;
+  ConjVPS = conjunctDistrTable PerGenNum ;
+
+  PredVPS np vps = {
+    s = \\_ => np.s ! Nom ++ vps.s ! np.a.pgn -- first quick version with order always Nominal.
+    } ;                                       -- if necessary, change VPS into {s : PerGenNum => Order => {before,after : Str}}
 
 }

src/arabic/IdiomAra.gf

@@ -9,10 +9,10 @@ concrete IdiomAra of Idiom = CatAra ** open
  lin
 
   -- : VP -> Cl ;        -- it is hot
-  ImpersCl vp =
-    let it : ResAra.NP = case vp.isPred of {
-    		True  => pron2np (pgn2pron vp.obj.a.pgn) ;
-	        False => pgn2pron vp.obj.a.pgn } ; -- if no obj, Per3 Masc Sg chosen by default
+  -- "it is a girl" becomes "she is a girl";
+  -- "it is twins" becomes "they<dual> are<dual> twins".
+  ImpersCl vp =            -- if no obj, default Per3 Masc Sg
+    let it : ResAra.NP = gn2pron vp.obj.a.gn ;
      in predVP it vp ;
 
   --  : VP -> Cl ;        -- one sleeps
@@ -25,19 +25,22 @@ concrete IdiomAra of Idiom = CatAra ** open
   CleftAdv adv s =
     let comp : Comp = CompAdv (lin Adv {s = adv.s ++ s.s ! Verbal}) ; -- no idea about word order /IL
         pass_V = mkV "مضي" va vi ; -- switch to copula or some other verb if better /IL
-     in predVP emptyNP (UseV pass_V ** {isPred=True ; pred=comp}) ; -- very hacky /IL
+     in predVP emptyNP (UseV pass_V ** {vtype=Copula ; pred=comp}) ; -- very hacky /IL
 
    -- : NP -> Cl ;        -- there is a house
   ExistNP np =
-    predVP (emptyNP ** {s=\\c=>"هُنَاكَ"}) (UseComp (CompNP np)) ; -- IL
+    predVP (indeclNP "هُنَاكَ" Sg) (UseComp (CompNP np)) ; -- IL
 
-  -- ExistIP   : IP -> QCl ;       -- which houses are there
+  -- : IP -> QCl ;       -- which houses are there
+  ExistIP ip = let cl = ExistNP (ip2np ip False) in {
+    s = \\t,p,q => cl.s ! t ! p ! Nominal -- IL guessed
+    } ;
 
 -- 7/12/2012 generalizations of these
 
   -- : NP -> Adv -> Cl ;    -- there is a house in Paris
   ExistNPAdv np adv =
-    predVP (emptyNP ** {s=\\c=>"هُنَاكَ"}) (AdvVP (UseComp (CompNP np)) adv) ; -- IL
+    predVP (indeclNP "هُنَاكَ" Sg) (AdvVP (UseComp (CompNP np)) adv) ; -- IL
 
    -- ExistIPAdv : IP -> Adv -> QCl ;   -- which houses are there in Paris
 

src/arabic/LangAra.gf

@@ -9,5 +9,3 @@ concrete LangAra of Lang =
   flags startcat = Phr ; unlexer = text ; lexer = text ; coding = utf8 ;
 
 }
-
-

src/arabic/LexiconAra.gf

@@ -11,15 +11,14 @@ flags
   lin
 
   airplane_N   = sdfN "طءر" "فاعِلة" Fem NoHum ;
-  answer_V2S   = dirV2 (v3 "جوب") ;
+  answer_V2S   = mkV2S (v3 "جوب") ;
   apartment_N  = brkN "شقّ" "فِعّة" "فِعَل" Fem NoHum ;
   apple_N      = sdfN "تفح" "فِعّالة" Fem NoHum ;
   art_N        = brkN "فنن" "فَعّ" "فُعُول" Masc NoHum ;
   ask_V2Q      = dirV2 (regV "يَسءَل") ;
 --  ask_V2Q      = dirV2 (v1 "سءل" a a) ;
   baby_N       = brkN "طفل" "فِعل" "أَفعَال" Masc Hum;
---  bad_A        = sndA "سوء" "فَيِّع" ;
-  bad_A        = degrA "سَيِّئ" "سَيِّئَة" "سَيِّئِين" ;
+  bad_A        = sndA "سوء" "فَيِّع" ;
   bank_N       = brkN "بنك" "فَعل" "فُعُول" Masc NoHum ;
   beautiful_A  = sndA "جمل" "فَعِيل" ;
   become_VA    = mkVA (v4 "صبح") ;
@@ -133,7 +132,7 @@ flags
   meat_N       = brkN "لحم" "فَعلة" "فُعُول" Masc NoHum ;
   milk_N       = brkN "حلب" "فَعِيل" "فَعِيل" Masc NoHum ; --no plur
   moon_N       = brkN "قمر" "فَعَل" "أَفعَال" Masc NoHum ;
-  mother_N2    = mkN2 (sdfN "ءم" "فُعَّ" Fem Hum) ;
+  mother_N2    = mkN2 (mkN "أُمّ" "أُمَّات" Fem Hum) ;
   mountain_N   = brkN "جبل" "فَعَل" "فِعَال" Masc NoHum ;
   music_N      = mkN (reg "مُوسِيقَى" "مُوسِيقَى") Fem NoHum ; --no plur
   narrow_A     = sndA "ضيق" "فَعِّل" ;
@@ -143,7 +142,7 @@ flags
   old_A        = sndA "قدم" "فَعِيل" ;
   open_V2      = dirV2 (regV "يَفتَح") ;
 --  open_V2      = dirV2 (v1 "فتح" a a ) ;
-  paint_V2A    = mkV2A (regV "يَدهَن" ) [] ;
+  paint_V2A    = dirV2 (regV "يَدهَن" ) ;
 --  paint_V2A    = mkV2A (v1 "دهن" a a ) [] ;
   paper_N      = brkN "ورق" "فَعَلة" "أَفعَال" Fem NoHum ;
   paris_PN     = mkPN "بارِيس" Fem NoHum  ;

src/arabic/MissingAra.gf

@@ -4,7 +4,6 @@ resource MissingAra = open GrammarAra, Prelude in {
 oper AdAdv : AdA -> Adv -> Adv = notYet "AdAdv" ;
 oper AdVVP : AdV -> VP -> VP = notYet "AdVVP" ;
 oper AdnCAdv : CAdv -> AdN = notYet "AdnCAdv" ;
-oper AdvIAdv : IAdv -> Adv -> IAdv = notYet "AdvIAdv" ;
 oper BaseRS : RS -> RS -> ListRS = notYet "BaseRS" ;
 oper CAdvAP : CAdv -> AP -> NP -> AP = notYet "CAdvAP" ;
 oper CleftNP : NP -> RS -> Cl = notYet "CleftNP" ;
@@ -12,30 +11,18 @@ oper ComparAdvAdj : CAdv -> A -> NP -> Adv = notYet "ComparAdvAdj" ;
 oper ComparAdvAdjS : CAdv -> A -> S -> Adv = notYet "ComparAdvAdjS" ;
 oper ConjRS : Conj -> ListRS -> RS = notYet "ConjRS" ;
 oper ConsRS : RS -> ListRS -> ListRS = notYet "ConsRS" ;
-oper DetNP : Det -> NP = notYet "DetNP" ;
-oper EmbedQS : QS -> SC = notYet "EmbedQS" ;
-oper EmbedS : S -> SC = notYet "EmbedS" ;
-oper EmbedVP : VP -> SC = notYet "EmbedVP" ;
-oper ExistIP : IP -> QCl = notYet "ExistIP" ;
 oper FunRP : Prep -> NP -> RP -> RP = notYet "FunRP" ;
 oper ImpPl1 : VP -> Utt = notYet "ImpPl1" ;
-oper ImpersCl : VP -> Cl = notYet "ImpersCl" ;
 oper PConjConj : Conj -> PConj = notYet "PConjConj" ;
 oper PPartNP : NP -> V2 -> NP = notYet "PPartNP" ;
 oper PredSCVP : SC -> VP -> Cl = notYet "PredSCVP" ;
 oper ProgrVP : VP -> VP = notYet "ProgrVP" ;
-oper ReflA2 : A2 -> AP = notYet "ReflA2" ;
-oper ReflVP : VPSlash -> VP = notYet "ReflVP" ;
-oper SentAP : AP -> SC -> AP = notYet "SentAP" ;
 oper SentCN : CN -> SC -> CN = notYet "SentCN" ;
 oper SlashPrep : Cl -> Prep -> ClSlash = notYet "SlashPrep" ;
-oper Slash2V3 : V3 -> NP -> VPSlash = notYet "Slash2V3" ;
 oper SlashV2A : V2A -> AP -> VPSlash = notYet "SlashV2A" ;
 oper SlashV2Q : V2Q -> QS -> VPSlash = notYet "SlashV2Q" ;
-oper SlashV2S : V2S -> S -> VPSlash = notYet "SlashV2S" ;
 oper SlashVS : NP -> VS -> SSlash -> ClSlash = notYet "SlashVS" ;
 oper SubjS : Subj -> S -> Adv = notYet "SubjS" ;
 oper VocNP : NP -> Voc = notYet "VocNP" ;
 oper pot3plus : Sub1000 -> Sub1000 -> Sub1000000 = notYet "pot3plus" ;
-
 }

src/arabic/NounAra.gf

@@ -13,7 +13,7 @@ lin
                          _  => Dl } ;
                 False => sizeToNumber det.n } ;
     determiner : Case -> Str = \c ->
-      det.s ! cn.h ! (detGender cn.g det.n) ! c ;
+      det.s ! cn.h ! detGender cn.g det.n ! c ;
     noun : Case -> Str = \c ->
       cn.s ! number
            ! nounState det.d number
@@ -22,32 +22,39 @@ lin
       cn.s2 ! number
             ! (definite ! det.d) -- Indef remains Indef, rest become Def
             ! c
-    } in {
-      s = \\c =>
-        case cnB4det det.isPron det.isNum det.n det.d of {
-          False => determiner c 
-                ++ noun c 
-                ++ adj c
-                ++ cn.np ! c ; 
-          True => noun (cas c) -- deal with possessive suffix
-               ++ determiner c -- (nounCase c det.n det.d) --??
-               ++ adj c
-               ++ cn.np ! c
+    } in emptyNP ** {
+      s = \\c => -- Dat is just a hack for liPrep
+        let c' = case c of {Dat => Gen ; x => x} in
+        case cnB4det det of {
+          False => determiner c'
+                ++ noun c'
+                ++ adj c'
+                ++ cn.np ! c' ;
+          True => noun (cas c) -- deal with possessive suffix + dative hack
+               ++ determiner c'
+               ++ adj c'
+               ++ cn.np ! c'
         };
       a = { pgn = agrP3 cn.h cn.g number;
             isPron = False } ;
-      empty = []
-    };
+      isHeavy = cn.isHeavy
+    } ;
 
-  UsePN pn = {
-    s =  pn.s;
-    a = {pgn = Per3 pn.g Sg ; isPron = False} ;
-    empty = []
+  UsePN pn = emptyNP ** {
+    s = pn.s;
+    a = {pgn = Per3 pn.g Sg ; isPron = False}
     };
 
   UsePron p = p ;
 
-  DetNP det = emptyNP ** {s = det.s ! NoHum ! Masc} ; ----
+  DetNP det = case det.isEmpty of {
+    True => case <det.d,det.n> of {  -- if the s field is empty, make up some other determiner
+              <Def,One>   => he_Pron ;
+              <Def,_>     => theyMasc_Pron ;
+              <Indef,One> => emptyNP ** {s = someSg_Det.s ! NoHum ! Masc} ;
+              _           => emptyNP ** {s = somePl_Det.s ! NoHum ! Masc}
+            } ;
+    False => emptyNP ** {s = det.s ! NoHum ! Masc} } ;
 
   PredetNP det np = np ** {
     s = \\c => case det.isDecl of {
@@ -69,22 +76,23 @@ lin
 -}
 
   AdvNP np adv = np ** {
-    s = \\c => np.s ! c ++ adv.s
+    s = \\c => np.s ! c ++ adv.s ;
+    isHeavy = True ;
     };
 
   DetQuantOrd quant num ord = quant ** {
     s = \\h,g,c => let d = toDef quant.d num.n in
-         quant.s ! Pl ! h ! g ! c
+         quant.s ! Pl ! h ! g ! c -- TODO what is this Pl? Was there when I started /IL
       ++ num.s ! g ! d ! c
       --FIXME check this:
       ++ ord.s ! g
                ! case d of {Poss => Def ; _ => d}
                ! c ;
     n = num.n;
-    isNum = orB num.isNum ord.isNum ;
+    isNum = orB num.isNum ord.isNum  ;
     -- ord may come from OrdDigits or OrdNumeral
     -- num may come from NumCard : Card -> Num
-
+    isEmpty = False
     } ;
 
   DetQuant quant num = quant ** {
@@ -95,15 +103,18 @@ lin
       case num.n of {
         None => False;
         _    => num.isNum
-      }
+      } ;
+    isEmpty =
+      case quant.isEmpty of {
+        True => notB num.isNum ;
+        _    => False }
     } ;
 
-  PossPron p = {
+  PossPron p = baseQuant ** {
     s = \\_,_,_,_ => BIND ++ p.s ! Gen;
     d = Poss;
-    is1sg = case p.a.pgn of { Per1 Sing => True ; _ => False } ;
-    isPron = True;
-    isNum = False } ;
+    is1sg = is1sg p.a ;
+    isPron = p.a.isPron} ;
 
   NumSg = {
     s = \\_,_,_ => [] ;
@@ -154,27 +165,31 @@ lin
   DefArt = {
     s = \\_,_,_,_ => [];
     d = Def ;
-    isNum,isPron,is1sg = False
+    isNum,isPron,is1sg = False ;
+    isEmpty = True
     } ;
 
   IndefArt = {
     s = \\_,_,_,_ => [];
     d = Indef ;
-    isNum,isPron,is1sg = False
+    isNum,isPron,is1sg = False ;
+    isEmpty = True
     } ;
 
-  MassNP cn =
-    {s = \\c => cn2str cn Sg Indef c ; 
-     a = {pgn = Per3 cn.g Sg ; isPron = False} ;
-     empty = []} ;
-
+  MassNP cn = emptyNP ** {
+    s = \\c => cn2str cn Sg Indef c ;
+    a = {pgn = Per3 cn.g Sg ; isPron = False} ;
+    isHeavy = cn.isHeavy ;
+    } ;
 
   UseN,
   UseN2 = useN ;
   Use2N3 n3 = n3 ;
   Use3N3 n3 = n3 ** {c2 = n3.c3} ;
 
-  ComplN2 n2 np = UseN n2 ** {np = \\c => n2.c2.s ++ bindIf n2.c2.binds ++ np.s ! n2.c2.c} ;
+  ComplN2 n2 np = UseN n2 ** {
+    np = \\c => n2.c2.s ++ bindIf n2.c2.binds ++ np.s ! n2.c2.c
+    } ;
 
   ComplN3 n3 np = ComplN2 n3 np ** {c2 = n3.c3} ;
 
@@ -183,20 +198,39 @@ lin
     };
 
   RelCN cn rs = cn ** {
-    s2 = \\n,s,c => cn.s2 ! n ! s ! c ++ rs.s ! {pgn=Per3 cn.g n ; isPron=False} ! c};
+    s2 = \\n,s,c => cn.s2 ! n ! s ! c
+        ++ rs.s ! Per3 cn.g n ! c ;
+    isHeavy = True
+    } ;
 
-  RelNP np rs = np ** {s = \\c => np.s ! c ++ rs.s ! np.a ! c} ;
+
+  RelNP np rs = np ** {
+    s = \\c => np.s ! c ++ rs.s ! np.a.pgn ! c ;
+    isHeavy = True
+    } ;
 
   AdvCN,
-  SentCN = \cn,ss -> cn ** {s2 = \\n,d,c => cn.s2 ! n ! d ! c ++ ss.s} ;
+  SentCN = \cn,ss -> cn ** {
+    np = \\c => cn.np ! c ++ ss.s ;
+    isHeavy = True
+    } ;
 
-  ApposCN cn np = cn ** { np = \\c => cn.np ! c ++ np.s ! c } ;
+  ApposCN cn np = cn ** {
+    np = \\c => cn.np ! c ++ np.s ! c
+    } ;
 
   -- : CN -> NP -> CN ;     -- house of Paris, house of mine
   PossNP cn np = cn ** {
-    s  = \\n,_d,c => cn.s  ! n ! Const ! c ;
-    s2 = \\n,_d,c => cn.s2 ! n ! Const ! Gen ;
-    np = \\c => cn.np ! c ++ np.s ! Gen
+    s  = \\n,d,c => cn.s  ! n ! case d of {Poss=>d ; _=>Const} ! c ;
+    s2 = \\n,d,c => cn.s2 ! n ! case d of {Poss=>d ; _=>Const} ! Gen ;
+    np = \\c => cn.np ! c
+          ++ case is1sg np.a of {
+                True => "لَدَي" ++ np.empty ;
+                False =>
+                  case np.a.isPron of {
+                    True => "لَدَي" ++ BIND ++ np.s ! Gen ;
+                    False =>  np.s ! Gen }
+             }
     };
 
   -- : CN -> NP -> CN ;     -- glass of wine

src/arabic/NumeralAra.gf

@@ -27,7 +27,7 @@ lincat
   lin n5 = num3_10  "خَمس"  "خامِس";
   lin n6 = num3_10  "سِتّ"   "سادِس";
   lin n7 = num3_10  "سَبع"  "سابِع";
-  lin n8 = num3_10  "ثَمانِي" "ثامِن";
+  lin n8 = num3_10  "ثَمَانِي" "ثامِن";
   lin n9 = num3_10  "تِسع"  "تاسِع";
 
   lin pot01 = mkNum "واحِد" "أَوَّل" "أُولى" ** { n = One } ;

src/arabic/OrthoAra.gf

@@ -6,8 +6,16 @@ oper
 
   vow : pattern Str = #("َ" | "ِ" | "ُ" | "ً" | "ٍ" | "ٌ") ;
 
+  vstar : pattern Str = #("َ"|"ِ"|"ُ"|"ً"|"ٍ"|"ٌ"|"ْ"|"ا"|"ي"|"و") ; -- long or short vowels
+
+  astar : pattern Str = #("َ"|"ً"|"ا") ; -- a: short, nunated or long
+  istar : pattern Str = #("ِ"|"ي"|"يْ") ; -- i: short, long or long with sukun
+  ustar : pattern Str = #("ُ"|"و"|"وْ") ; -- u: short, long or long with sukun
+
   weak : pattern Str = #("و"|"ي") ;
 
+  hamzaseat : pattern Str = #("أ"|"ؤ"|"ئ") ;
+
   -- "Sun letters": assimilate with def. article
   sun : pattern Str = #("ت"|"ث"|"د"|"ذ"|"ر"|"ز"|"س"|"ش"|"ص"|"ض"|"ط"|"ظ"|"ل"|"ن") ;
 
@@ -30,19 +38,19 @@ oper
 
   rectifyHmz : Str -> Str = \word ->
     case word of {
-      l@(""|"ال") + ("أ"|"أَ") + #hamza + "ْ" + tail => l + "آ" + tail;
-      l@(""|"ال") + ("أ"|"أَ") + #hamza  + tail      => l + "آ" + tail;
+      l@(""|"ل"|"ال") + ("أ"|"أَ") + #hamza + "ْ" + tail => l + "آ" + tail;
+      l@(""|"ل"|"ال") + ("أ"|"أَ") + #hamza  + tail      => l + "آ" + tail;
       l@(""|"ال") + #hamza + v@("َ"|"ُ") + tail      => l + "أ" + v + tail;
       l@(""|"ال") + #hamza + v@("ِ")     + tail      => l + "إ" + v + tail;
-      head + v1@(#vow|"ْ"|"ا"|"ي"|"و") 
+      head + v1@#vstar
            + #hamza + v2@(#vow|"ْ") + tail =>
               case v2 of { "ْ" => head + v1 + bHmz v1 v2      + tail ; -- unsure about this /IL
                            _   => head + v1 + bHmz v1 v2 + v2 + tail } ;
-      head + v1@(#vow|"ْ"|"ا"|"ي"|"و") -- the same but it ends in vowel
+      head + v1@#vstar -- the same but it ends in vowel
            + #hamza + v2@(#vow|"ْ") =>
               case v2 of { "ْ" => head + v1 + tHmz v1 ;
                            _   => head + v1 + tHmz v1 + v2 } ;
-      head + v1@(#vow|"ْ"|"ا"|"ي"|"و") -- the same but it ends without vowel
+      head + v1@#vstar -- the same but it ends without vowel
            + #hamza => head + v1 + tHmz v1 ;
 
       head + #hamza + tail     => head + (bHmz (dp 2 head) (take 2 tail)) + tail; --last head , take 1 tail
@@ -57,21 +65,22 @@ oper
     };
 
   --hamza in middle of word (body)
+  -- relaxing the pattern matching, so that we can call it from ResAra.sing /IL
   bHmz : Str -> Str -> Str = \d1,d2 ->
     case <d1,d2> of {
-      <"ِ",_> | <_,"ِ"> => "ئ";
-    <"ُ",_> | <_,"ُ"> => "ؤ";
-    <"َ",_> | <_,"َ"> => "أ";
-    _				   => "ء"
+      <_+#istar,_> | <_,#istar> => "ئ";
+      <_+#ustar,_> | <_,#ustar> => "ؤ";
+      <_+"َ" ,_>   | <_,"َ">  => "أ"; -- #astar would allow double alif
+      _                       => "ء"
     };
 
   --hamza carrier sequence
   tHmz : Str -> Str = \d ->
     case d of {
       "ِ" => "ئ";
-    "ُ" => "ؤ";
-    "َ" => "أ";
-    "ْ"|"ا"|"و"|"ي" => "ء"
+      "ُ" => "ؤ";
+      "َ" => "أ";
+      _   => "ء" -- long vowels and sukun
     };
 
 }

src/arabic/ParadigmsAra.gf

@@ -3,6 +3,7 @@
 --1 Arabic Lexical Paradigms
 --
 -- Ali El Dada 2005--2006
+-- Inari Listenmaa 2018-
 --
 -- This is an API to the user of the resource grammar
 -- for adding lexical items. It gives functions for forming
@@ -26,8 +27,9 @@
 resource ParadigmsAra = open
   Predef,
   Prelude,
-  MorphoAra,
-  OrthoAra,(ResAra=ResAra),
+  ResAra,
+  OrthoAra,
+  (A=AdjectiveAra),
   CatAra
   in {
 
@@ -35,93 +37,71 @@ resource ParadigmsAra = open
 
   oper
 
-  Case : Type ;
-  nom : Case ;
-  acc : Case ;
-  gen : Case ;
+  Case : Type ; -- Argument to mkPrep
+  nom : Case ; -- Nominative
+  acc : Case ; -- Accusative
+  gen : Case ; -- Genitive
 
--- Prepositions are used in many-argument functions for rection.
-  Preposition : Type ;
-  noPrep : Preposition ;
-  casePrep : Case -> Preposition ;
-   --- TODO: continue, add all over the grammar
+  Gender : Type ; -- Argument to mkN and mkPN
+  masc : Gender ; -- Masculine
+  fem : Gender ; -- Feminine
 
-  Gender : Type ;
-  masc : Gender ;
-  fem : Gender ;
+  Number : Type ; -- Argument to mkConj ("NP and NP" plural; "NP or NP" singular), and special cases of mkN, where nominal attribute is included in the N.
+  sg : Number ; -- Singular
+  pl : Number ; -- Plural
 
-  Number : Type ;
-  sg : Number ;
-  pl : Number ;
+  Species : Type ; -- Argument to mkN.
+  hum : Species ;  -- Human nouns (teacher, woman, brother, …)
+  nohum : Species ; -- Any other nouns (house, dog, …)
 
-  Species : Type ;
-  hum : Species ;
-  nohum : Species ;
-
-  Vowel : Type ;
-  va : Vowel ;
-  vi : Vowel ;
-  vu : Vowel ;
+  Vowel : Type ; -- Argument to mkV, when constructing verbs of Form I.
+  va : Vowel ; -- a (fatha) as the perfect or imperfect vowel, e.g. فعَل
+  vi : Vowel ; -- i (kasra) as the perfect or imperfect vowel, e.g  فعِل
+  vu : Vowel ; -- u (damma) as the perfect or imperfect vowel, e.g. فعُل
 
 --2 Nouns
 
 -- Overloaded operator for main cases
 
+  mkN : overload {
+    mkN : (sg : Str) -> N ; -- Takes the singular without case marking, gives a non-human regular noun. Plural is sound feminine if the word ends in ة, otherwise sound masculine.
+    mkN : (sg,pl : Str) -> Gender -> Species -> N ; -- Takes the singular and the plural (sound or broken) forms without case marking, returns a noun with basic triptote declension. NB for irregular/weak roots, safer to use brkN, sdfN or sdmN, which take root and pattern.
+    mkN : (root,sgPat,plPat : Str) -> Gender -> Species -> N ; -- (This is brkN; see its description.)
+    mkN : Species -> N -> N ;      -- Change species (hum/nohum) of a noun.
+    mkN : N -> (attr : Str) -> N ; -- Compound noun with invariant attribute.
+    mkN :           N -> N -> N ;  -- Compound noun with singular genitive attribute, but inflects in state.
+    mkN : Number -> N -> N -> N ;  -- Compound noun with genitive attribute, but inflects in state. Attribute's number specified by 1st arg.
+    } ;
 
- mkN : overload {
-   mkN : (sg : Str) -> N ; -- non-human regular nouns
-   mkN : Species -> N -> N ;
-   mkN : (sg,pl : Str) -> Gender -> Species -> N ;
-   mkN : NTable -> Gender -> Species -> N ;  -- loan words, irregular
-   mkN : (root,sgPatt,brokenPlPatt : Str) -> Gender -> Species -> N ; -- broken plural
-   mkN : N -> (attr : Str) -> N ; -- Compound noun with invariant attribute
-   mkN : N -> N -> N ;            -- Compound noun where attribute inflects in state and case. Attribute in singular.
-   mkN : Number -> N -> N -> N ;  -- Compound noun where attribute inflects in state and case. Attribute's number specified by 1st arg.
----   mkN : (root,sgPatt : Str) -> Gender -> Species -> N                -- sound feminine plural
----    = sdfN ;
-   } ;
+  brkN : (root,sgPat,brokenPlPat : Str) -> Gender -> Species -> N ; -- Takes a root string, a singular pattern string, a broken plural pattern string, a gender, and species. Gives a noun. (This is also overloaded as mkN.)
+
+  sdfN : (root,sgPat : Str) -> Gender -> Species -> N ; -- Takes a root string, a singular pattern string, a gender, and species. Gives a noun whose plural is sound feminine.
+
+  sdmN : (root,sgPat : Str) -> Gender -> Species -> N ; -- Takes a root string, a singular pattern string, a gender, and species. Gives a noun whose plural is sound masculine
 
   dualN : N -> N ; -- Force the plural of the N into dual (e.g. "twins")
 
---This is used for loan words or anything that has untreated irregularities
---in the interdigitization process of its words
-  mkFullN : NTable -> Gender -> Species -> N ;
-
---Takes a root string, a singular pattern string, a broken plural
---pattern string, a gender, and species. Gives a noun.
-  brkN : Str -> Str -> Str -> Gender -> Species -> N ;
-
---Takes a root string, a singular pattern string, a gender,
---and species. Gives a noun whose plural is sound feminine.
-  sdfN : Str -> Str -> Gender -> Species -> N ;
-
---takes a root string, a singular pattern string, a gender,
---and species. Gives a noun whose plural is sound masculine
-  sdmN : Str -> Str -> Gender -> Species -> N ;
-
-
 --3 Proper names
 
   mkPN = overload {
-    mkPN : Str -> PN        -- Fem Hum if ends with ة, otherwise Masc Hum
+    mkPN : Str -> PN  -- Predictable PN from a Str: fem hum if ends in ة, otherwise masc hum.
      = smartPN ;
-    mkPN : N -> PN
-     = \n -> lin PN (n ** {s = \\c => n.s ! Sg ! Const ! c ++ n.s2 ! Sg ! Const ! c }) ; -- no idea /IL
-    mkPN : Str -> Gender -> Species -> PN
+    mkPN : N -> PN    -- Make a PN out of N. The PN is in construct state.
+     = \n -> lin PN (n ** {
+          s = \\c => n.s ! Sg ! Const ! c
+                  ++ n.s2 ! Sg ! Def ! c -- NB this hack works for idaafa constructions (if you used mkN : N -> N -> N), but wrong for mkN : N -> A -> N. /IL
+        }) ;
+    mkPN : Str -> Gender -> Species -> PN -- Make a PN out of string, gender and species.
      = mkFullPN ;
-    } ;
-
-  mkFullPN : Str -> Gender -> Species -> PN ;
-
-
+  } ;
 
 --3 Relational nouns
 
   mkN2 : overload {
-    mkN2 : N -> Preposition -> N2 ; -- ready-made preposition
-    mkN2 : N -> Str -> N2 ; -- preposition given as a string
-    mkN2 : N -> N2 ; -- no preposition
-    mkN2 : Str -> N2 ; -- no preposition, predictable inflection
+    mkN2 : N -> Prep -> N2 ; -- Noun and a ready-made preposition.
+    mkN2 : N -> Str -> N2 ; -- Noun, preposition given as a string, complement case genitive.
+    mkN2 : N -> N2 ;   -- Noun, no preposition, complement case genitive.
+    mkN2 : Str -> N2 ; -- Predictable inflection, no preposition, complement case genitive.
   } ;
 
   mkN3 : overload {
@@ -129,38 +109,41 @@ resource ParadigmsAra = open
     mkN3 : N -> Str -> Str -> N3 ;  -- prepositions given as strings
   } ;
 
-
 --2 Adjectives
 
 -- Overloaded operator for main cases
 
- mkA = overload {
-   mkA : (root,sg : Str) -> A             -- adjective with sound plural; takes root string and sg. pattern string
-    = \r,p -> lin A (sndA r p);
-   mkA : (root : Str) -> A                -- adjective with positive form aFCal
-    = \r -> lin A (clrA r);
-   mkA : (root,sg,pl : Str) -> A          -- adjective with broken plural
-    = \r,s,p -> lin A (brkA r s p) ;
-   } ;
+  mkA = overload {
+    mkA : (root : Str) -> A                -- adjective with positive form aFCal
+      = \r -> lin A (clrA r);
+    mkA : (root,sgPat : Str) -> A             -- adjective with sound plural, takes root string and sg. pattern string
+      = \r,p -> lin A (sndA r p);
+    mkA : (root,sgPat,plPat : Str) -> A          -- adjective with broken plural, same for both fem. and masc.
+      = \r,s,p -> lin A (brkA r s p) ;
+    mkA : (isSoundFem : Bool) -> (root,sg,pl : Str) -> A -- adjective with broken plural, boolean argument whether feminine is sound (True) or shared with masc (False)
+      = \b,r,s,p -> lin A (brkABool b r s p) ;
+    mkA : A -> Str -> A -- add non-inflecting component after adjective
+      = \a,s -> a ** {s = table {af => a.s ! af ++ s}} ;
+    mkA : Str -> A -> A -- add non-inflecting component before adjective
+      = \s,a -> a ** {s = table {af => s ++ a.s ! af}}
+    } ;
 
-  degrA : (posit,compar,plur : Str) -> A ;
+  nisbaA : Str -> Adj ; -- Forms relative adjectives with the suffix ِيّ. Takes either the stem and adds يّ, or the whole word ending in يّ and just adds declension.
 
-  irregFemA : (masc : A) -> (fem : A) -> A ; -- adjective with irregular feminine. Takes two adjectives (masc. "regular" and fem. "regular") and puts them together.
+  idaafaA : N -> A -> A ; -- Forms adjectives of type غَيْرُ طَيِّبٍ 'not good'. Noun is in construct state but inflects in case. Adjective is in genitive, but inflects in gender, number and state.
 
---Takes a root string and a pattern string
-  sndA : (root,patt : Str) -> Adj ;
+  degrA : (masc,fem,plur : Str) -> A ; -- Adjective where masculine singular is also the comparative form. Indeclinable singular, basic triptote declension for dual and plural.
 
---Takes a root string only
-  clrA : (root : Str) -> Adj ;  -- forms adjectives of type aFCal
+  irregFemA : (masc : A) -> (fem : A) -> A ; -- Adjective with irregular feminine. Takes two adjectives (masc. regular and fem. "regular", with fem. forms in the masc fields,) and puts them together.
 
-  nisbaA : Str -> Adj ; -- forms relative adjectives by adding the suffix ِيّ
+  invarGenderA : A -> A ; -- Forms an adjective that has no feminine form. Takes a regular adjective and forces the masculine forms into the fem. table.
 
 --3 Two-place adjectives
 --
 -- Two-place adjectives need a preposition for their second argument.
 
   mkA2 : overload {
-    mkA2 : A -> Preposition -> A2 ;
+    mkA2 : A -> Prep -> A2 ;
     mkA2 : A -> Str -> A2
   } ;
 
@@ -189,41 +172,63 @@ resource ParadigmsAra = open
 -- build $PP$s in the resource API. Requires a string and a case.
 
   mkPrep : overload {
-    mkPrep : Str -> Prep ;
-    mkPrep : Str -> Case -> Prep
-  } ;  -- preposition in the sense of RGL abstract syntax
+    mkPrep : Str -> Prep ; -- Build a preposition out of the given string, with genitive case.
+    mkPrep : Str -> Case -> Prep ; -- Build a preposition out of the given string and case.
+    mkPrep : Case -> Prep ; -- Just a case, no preposition.
+  } ;
+
+  liPrep : Prep ; -- The preposition لِ, binding to its head. Vowel assimilation and def. article elision implemented.
+  biPrep : Prep ; -- The preposition بِ, binding to its head.
+  noPrep : Prep ; -- No preposition at all, "complement case" is nominative.
+
+--2 Conjunctions
+  mkConj : overload {
+    mkConj : Str -> Conj ; -- and
+    mkConj : Str -> Str -> Conj ; -- either … or
+    mkConj : Str -> Number -> Conj ; -- and, pl
+    mkConj : Str -> Str -> Number -> Conj ; -- either, or, sg
+  } ;
+
 --2 Verbs
 
 -- Overloaded operations
 
   mkV : overload {
-    mkV : (imperfect : Str) -> V ; -- The verb in Per3 Sg Masc imperfect tense gives the most information
-    mkV : (root : Str) -> (perf,impf : Vowel) -> V ; -- verb form I ; vowel = a|i|u
-    mkV : (root : Str) -> VerbForm -> V ;  -- FormI .. FormX (no VII, IX) ; default vowels a u for I
+    mkV : (imperfect,masdar : Str) -> V ; -- Takes a verb of Form I in 3rd person masculine imperfect tense. Unpredictable masdar given as an argument.
+    mkV : (imperfect : Str) -> V ; -- Takes a verb of Form I in 3rd person masculine imperfect tense. Dummy masdar inserted.
+    mkV : (root : Str) -> (perf,impf : Vowel) -> (masdar : Str) -> V ; -- Takes the root of a verb of Form I. Vowel is one of {va,vi,vu}. Unpredictable masdar given as an argument.
+    mkV : (root : Str) -> (perf,impf : Vowel) -> V ; -- Like above, but dummy masdar inserted. This function is here only to keep compatibility for the old API; for new grammars, use the constructor with masdar as an argument.
+    mkV : (root,masdar : Str) -> VerbForm -> V ;  -- FormI…FormXI (no IX). XI is quadriliteral. For FormI, default vowels are va and vu. The given masdar is used for FormI, but currently ignored for Forms II-XI.
+    mkV : (root : Str) -> VerbForm -> V ;  -- Like above, but dummy masdar inserted for FormI verbs. No difference for FormII-FormXI, because they have predictable masdar.
     mkV : V -> (particle : Str) -> V -- V with a non-inflecting particle/phrasal verb
     } ;
 
-  -- regV : Str -> V ;
-
   reflV : V -> V ; -- نَفْس in the proper case and with possessive suffix, e.g.  نَفْسَكِ
 
-  v1 : Str -> Vowel -> Vowel -> V ; -- Verb Form I : fa`ala, fa`ila, fa`ula
+  v1 = overload {
+    v1 : (root : Str) -> (perf,impf : Vowel) -> (masdar : Str) -> V -- Verb Form I: fa`ala, fa`ila, fa`ula. Verbal noun (masdar) given as the third argument.
+     = v1masdar ;
+    v1 : (root : Str) -> (perf,impf : Vowel) -> V -- To keep compatibility for the old API; dummy masdar inserted.
+     = v1dummymasdar ;
+  } ;
 
-  v2 : Str -> V ; -- Verb Form II : fa``ala
+  v2 : Str -> V ; -- Verb Form II: fa``ala
 
-  v3 : Str -> V ; -- Verb Form III : faa`ala
+  v3 : Str -> V ; -- Verb Form III: faa`ala
 
-  v4 : Str -> V ; -- Verb Form IV : 'af`ala
+  v4 : Str -> V ; -- Verb Form IV: 'af`ala
 
-  v5 : Str -> V ; -- Verb Form V : tafa``ala
+  v5 : Str -> V ; -- Verb Form V: tafa``ala
 
-  v6 : Str -> V ; -- Verb Form VI : tafaa`ala
+  v6 : Str -> V ; -- Verb Form VI: tafaa`ala
 
-  v7 : Str -> V ; -- Verb Form VII : infa`ala
+  v7 : Str -> V ; -- Verb Form VII: infa`ala
 
-  v8 : Str -> V ; -- Verb Form VIII ifta`ala
+  v8 : Str -> V ; -- Verb Form VIII: ifta`ala
 
-  v10 : Str -> V ; -- Verb Form X 'istaf`ala
+  v10 : Str -> V ; -- Verb Form X: 'istaf`ala
+
+  v11 : Str -> V ; -- Verb Form XI (quadriliteral): fa`laba
 
 --3 Two-place verbs
 
@@ -233,7 +238,7 @@ resource ParadigmsAra = open
   mkV2 : overload {
     mkV2 : V -> V2 ; -- No preposition
     mkV2 : V -> Str -> V2 ; -- Preposition as string, default case genitive
-    mkV2 : V -> Preposition -> V2 ; -- Ready-made preposition
+    mkV2 : V -> Prep -> V2 ; -- Ready-made preposition
     mkV2 : Str -> V2 ; -- Predictable verb conjugation, no preposition
   } ;
 
@@ -245,11 +250,11 @@ resource ParadigmsAra = open
 -- the first one or both can be absent.
 
   mkV3 : overload {
-    mkV3 : V -> Preposition -> Preposition -> V3 ; -- speak, with, about
+    mkV3 : V -> Prep -> Prep -> V3 ; -- speak, with, about
     mkV3 : V -> (to : Str)  -> (about:Str) -> V3  -- like above, but with strings as arguments (default complement case genitive)
   } ;
   dirV3 : overload {
-    dirV3 : V -> Preposition -> V3 ; -- give,_,to
+    dirV3 : V -> Prep -> V3 ; -- give,_,to
     dirV3 : V -> (to : Str)  -> V3   -- like above, but with string as argument (default complement case genitive)
   } ;
   dirdirV3 : V -> V3 ;               -- give,_,_
@@ -260,23 +265,35 @@ resource ParadigmsAra = open
 -- questions, verb phrases, and adjectives.
 
   mkV0  : V -> V0 ;
-  mkVS  : V -> VS ;
-  mkV2S : V -> Str -> V2S ;
+  mkVS : overload {
+    mkVS : V -> VS ; -- Takes a V, returns a VS with default complementiser أَنَّ.
+    mkVS : V -> Str -> VS -- Takes a V and a complementiser.
+    } ;
+  mkV2S : overload {
+    mkV2S : V -> V2S ;  -- Takes a V, returns a V2S with default complementiser أَنَّ and accusative as the direct object case.
+    mkV2S : VS -> V2S ; -- Takes a VS, returns a V2S with accusative as the object case, retaining the VS's complementiser.
+    mkV2S : V2 -> V2S ; -- Takes a V2, returns a V2S with default complementiser أَنَّ, retaining the V2's direct object case.
+    mkV2S : V -> Prep -> Str -> V2S ; -- Takes V, preposition and complementiser.
+  } ;
   mkVV = overload {
-    mkVV : V -> VV = regVV ;
-    mkVV : V -> Str -> VV = c2VV ;
-    mkVV : V -> Preposition -> VV = prepVV ;
-    mkVV : V -> Preposition -> Preposition -> VV = prep2VV
+    mkVV : V -> VV -- Takes a V, returns a VV with default complementiser أَنَّ.
+     = regVV ;
+    mkVV : V -> Str -> VV -- Takes a V and a complementiser.
+     = s2VV ;
     } ;
   mkV2V : overload {
-    mkV2V : V -> Str -> Str -> V2V ;
-    mkV2V : V -> Preposition -> Preposition -> V2V ;
-    mkV2V : VV -> Preposition -> V2V
+    mkV2V : V -> V2V ; -- Takes a V, returns a V2V with default complementiser أَنْ and accusative as the direct object case.
+    mkV2V : VV -> V2V ; -- Takes VV, returns V2V with accusative as the object case, retaining the VV's complementiser.
+    mkV2V : V -> Prep -> Str -> V2V ; -- Takes V, preposition and complementiser.
+  } ;
+  subjCase : overload {
+    subjCase : VV -> Prep -> VV ; -- Change the subject case of a VV. (Default is nominative; use any other case or preposition.)
+    subjCase : V2V -> Prep -> V2V ; -- Change the subject case to a V2V. (Default is nominative; use any other case or preposition.)
   } ;
   mkVA  : V -> VA ;
-  mkV2A : V -> Str -> V2A ;
+  mkV2A : V -> Str -> V2A ; -- Takes a V and an object case/preposition. NB. V2A = V2, see mkV2 for more constructors.
   mkVQ  : V -> VQ ;
-  mkV2Q : V -> Str -> V2Q ;
+  mkV2Q : V -> Str -> V2Q ; -- Takes a V and an object case/preposition. NB. V2Q = V2, see mkV2 for more constructors.
 
   mkAS  : A -> AS ;
   mkA2S : A -> Str -> A2S ;
@@ -302,12 +319,6 @@ resource ParadigmsAra = open
   acc = ResAra.Acc ;
   gen = ResAra.Gen ;
 
--- Prepositions are used in many-argument functions for rection.
-
-  Preposition = ResAra.Preposition ;
-  noPrep = {s=[]; c=nom; binds=False} ;
-  casePrep c = {s=[]; c=c; binds=False} ;
-
   Gender = ResAra.Gender ;
   masc = ResAra.Masc ;
   fem = ResAra.Fem ;
@@ -329,14 +340,21 @@ resource ParadigmsAra = open
     mkPrep : Str -> Prep = \s ->
       lin Prep (mkPreposition s) ;
     mkPrep : Str -> Case -> Prep = \s,c ->
-      lin Prep (mkPreposition s c)
+      lin Prep (mkPreposition s c) ;
+    mkPrep : Case -> Prep = \c ->
+      lin Prep (casePrep c) ;
     } ;
 
+  noPrep = lin Prep ResAra.noPrep ;
+  biPrep = lin Prep ResAra.biPrep ;
+  liPrep = lin Prep ResAra.liPrep ;
+
+  casePrep : Case -> Prep = \c -> lin Prep {s=[]; c=c; binds=False} ;
 
   mkV2 = overload {
     mkV2 : V -> V2 = dirV2 ;
     mkV2 : V -> Str -> V2 = \v,p -> prepV2 v (mkPreposition p);
-    mkV2 : V -> Preposition -> V2 = prepV2 ;
+    mkV2 : V -> Prep -> V2 = prepV2 ;
     mkV2 : Str -> V2 = strV2;
   } ;
 
@@ -349,17 +367,25 @@ resource ParadigmsAra = open
    mkN : Species -> N -> N
      = \p,n -> n ** {h = p} ;
    mkN : (sg,pl : Str) -> Gender -> Species -> N
-     = \sg,pl -> mkFullN (reg sg pl) ;
-   mkN : NTable -> Gender -> Species -> N                             -- loan words, irregular
+     = \sg,pl -> case <sg,pl> of {
+          <x@(_ + "ة") + #vow*, _ + "ات" + #vow*> => mkFullN (sndf x) ; -- extra safety: if someone gives case marking to the constructor, ignore it
+          _ => mkFullN (reg sg pl) } ;
+   mkN : NTable -> Gender -> Species -> N -- TO BE DEPRECATED; kept for backwards-compatibility. For the same behaviour, use either the constructor above, sdfN or sdmN.
      = mkFullN ;
    mkN : (root,sgPatt,brokenPlPatt : Str) -> Gender -> Species -> N   -- broken plural
      = brkN ;
    mkN : N -> (attr : Str) -> N                                       -- Compound nouns with noninflecting attribute
-     = \n,attr -> n ** {s2 = \\n,s,c => attr} ;
+     = \n,attr -> n ** {s2 = \\num,s,c => n.s2 ! num ! s ! c ++ attr} ;
    mkN : N -> N -> N                                                  -- Compound nouns where attribute inflects in state and case but not number
      = attrN Sg ;
    mkN : Number -> N -> N -> N                                        -- Compound nouns where attribute inflects in state, case and number
      = attrN ;
+   mkN : N -> A -> N
+     = mkAN ;
+   mkN : Number -> N -> A -> N
+     = \num,n,a -> mkAPNumN n (A.PositA a) num ;
+   mkN : N -> AP -> N
+     = mkAPN
    } ;
 
   attrN : Number -> N -> N -> N = \num,n1,n2 -> n1 ** {
@@ -368,6 +394,18 @@ resource ParadigmsAra = open
                  ++ n2.s  ! num ! s ! Gen
                  ++ n2.s2 ! num ! s ! Gen} ;
 
+  mkAN : N -> A -> N = \n,a -> mkAPN n (A.PositA a) ;
+
+  mkAPN : N -> AP -> N = \n,ap -> n ** {
+    s2 = \\num,s,c => n.s2 ! num ! s ! c
+                   ++ ap.s ! n.h ! n.g ! num ! s ! c
+    } ;
+
+  mkAPNumN : N -> AP -> Number -> N = \n,ap,forceNum -> n ** {
+    s2 = \\num,s,c => n.s2 ! num ! s ! c
+                   ++ ap.s ! Hum ! n.g ! forceNum ! s ! c
+    } ; -- Hum because we want to override the smartness in number agreement
+
   dualN : N -> N = \n -> n ** {isDual=True} ;
 
   proDrop : NP -> NP ; -- Force a NP to lose its string, only contributing with its agreement.
@@ -375,69 +413,91 @@ resource ParadigmsAra = open
   mkPron : (_,_,_ : Str) -> PerGenNum -> Pron ;
 
   mkV = overload {
+    mkV : (imperfect,masdar : Str) -> V
+      = \v,m -> regV v m ;
     mkV : (imperfect : Str) -> V
-      = regV ;
-    mkV : (root : Str) -> (perf,impf : Vowel) -> V  -- verb form I ; vowel = a|i|u
-      = v1 ;
+      = \v -> regV v ;
+    mkV : (root : Str) -> (perf,impf : Vowel) -> (masdar : Str) -> V  -- verb form I ; vowel = a|i|u
+      = v1masdar ;
+    mkV : (root : Str) -> (perf,impf : Vowel) -> V  -- verb form I ; vowel = a|i|u ; dummy masdar
+      = v1dummymasdar ;
     mkV : (root : Str) -> VerbForm -> V             -- FormI .. FormX (no VII, IX) ; default vowels a u for I
       = formV ;
     mkV : V -> (particle : Str) -> V = \v,p ->
       v ** { s = \\vf => v.s ! vf ++ p } ;
-    } ;
+} ;
 
-  regV : Str -> V = \wo ->
-    let rau : Str * Vowel * Vowel =
-    case wo of {
-      "يَ" + fc + "ُ" + l => <fc+l, a, u> ;
-      "يَ" + fc + "ِ" + l => <fc+l, a, i> ;
-      "يَ" + fc + "َ" + l => <fc+l, a, a> ;
-      f@? + "َ" + c@? + "ِ" + l  => <f+c+l, i, a> ;
-      _ => Predef.error ("regV not applicable to" ++ wo)
-    }
-    in v1 rau.p1 rau.p2 rau.p3 ;
+  regV = overload {
+    regV : (v,msdr : Str) -> V = \wo,msdr ->
+      let rau : Str * Vowel * Vowel =
+      case wo of {
+        "يَ" + fc + "ُ" + l => <fc+l, a, u> ;
+        "يَ" + fc + "ِ" + l => <fc+l, a, i> ;
+        "يَ" + fc + "َ" + l => <fc+l, a, a> ;
+        f@? + "َ" + c@? + "ِ" + l  => <f+c+l, i, a> ;
+        _ => Predef.error ("regV not applicable to" ++ wo)
+      }
+      in v1masdar rau.p1 rau.p2 rau.p3 msdr ;
+    regV : Str -> V = \wo ->
+      let rau : Str * Vowel * Vowel =
+      case wo of {
+        "يَ" + fc + "ُ" + l => <fc+l, a, u> ;
+        "يَ" + fc + "ِ" + l => <fc+l, a, i> ;
+        "يَ" + fc + "َ" + l => <fc+l, a, a> ;
+        f@? + "َ" + c@? + "ِ" + l  => <f+c+l, i, a> ;
+        _ => Predef.error ("regV not applicable to" ++ wo)
+      } in v1dummymasdar rau.p1 rau.p2 rau.p3
+  } ;
 
-  v1 = \rootStr,vPerf,vImpf ->
-    let { raw = v1' rootStr vPerf vImpf } in
-    lin V { s = \\vf =>rectifyHmz (raw.s ! vf) } ;
+  v1masdar : Str -> (perf,impf : Vowel) -> (masdar : Str) -> V =
+    \rootStr,vPerf,vImpf,msdr ->
+      let { raw = v1' rootStr vPerf vImpf msdr }
+       in lin V { s = \\vf =>rectifyHmz (raw.s ! vf) } ;
 
-  v1' : Str ->  Vowel -> Vowel -> Verb =
-    \rootStr,vPerf,vImpf ->
+  v1dummymasdar : Str -> (p,i : Vowel) -> V = \rootStr,vPerf,vImpf ->
+    let { dummyMasdar = mkStrong facl (mkRoot3 rootStr) ;
+          raw = v1' rootStr vPerf vImpf dummyMasdar }
+     in lin V { s = \\vf =>rectifyHmz (raw.s ! vf) } ;
+
+  v1' : Str -> (p,i : Vowel) -> (masdar : Str) -> Verb =
+    \rootStr,vPerf,vImpf,masdar ->
     let root = mkRoot3 rootStr
      in case rootStr of {
-          _          + "ّ"   => v1geminate rootStr vPerf vImpf ;
-          ? + #hamza + #weak => v1doubleweak root ;
+          f@? + c@?  + "ّ"   => v1geminate (f+c+c) vPerf vImpf masdar ;
+          ? + #hamza + #weak => v1doubleweak root masdar ;
+          #weak + ?  + #weak => v1assimilated_defective root vPerf vImpf masdar ;
           ? + ?      + #weak => case vPerf of {
-                                  i => v1defective_i root vImpf ;
-                                  _ => v1defective_a root vImpf } ;
-          ? + #weak + ?      => v1hollow root vImpf ;
-          _                  => v1sound root vPerf vImpf } ;
+                                  i => v1defective_i root vImpf masdar ;
+                                  _ => v1defective_a root vImpf masdar } ;
+          ? + #weak + ?      => v1hollow root vImpf masdar ;
+          _                  => v1sound root vPerf vImpf masdar } ;
 
   v2 =
     \rootStr ->
     let {
       root = mkRoot3 rootStr
-    } in {
+    } in lin V {
       s =
-        case root.l of {
-          #weak => (v2defective root).s;
-          _       => (v2sound root).s
-        };
-      lock_V = <>
+        case rootStr of {
+--          #weak + ? + ? =>
+          ? + ? + #weak => (v2defective root).s;
+          _             => (v2sound root).s
+        }
     };
 
   v3 =
     \rootStr ->
     let {
       tbc = mkRoot3 rootStr ;
-    } in {
-      s = (v3sound tbc).s  ;
-      lock_V = <>
+    } in lin V {
+      s = (v3sound tbc).s
     };
 
   v4 =
     \rootStr ->
     let root : Root3 = mkRoot3 rootStr ;
         verb : Verb  = case rootStr of {
+          #weak + ? + ?      => v4assimilated root ;
           ? + #hamza + #weak => v4doubleweak root ;
           ? + #weak + ?      => v4hollow root ;
           _          + #weak => v4defective root  ;
@@ -447,63 +507,75 @@ resource ParadigmsAra = open
 
   v5 =
     \rootStr ->
-    let { raw = v5' rootStr } in
+    let { raw = v5' rootStr } in raw **
     { s = \\vf =>
         case rootStr of {
           _ + #hamza + _ => rectifyHmz(raw.s ! vf);
           _ => raw.s ! vf
-        };
-      lock_V = <>
+        }
     };
 
   v5' : Str -> V =
     \rootStr ->
     let {
       nfs = mkRoot3 rootStr ;
-    } in {
-      s = (v5sound nfs).s  ; lock_V = <>
+    } in lin V {
+      s = (v5sound nfs).s
     };
 
   v6 =
     \rootStr ->
     let {
       fqm = mkRoot3 rootStr ;
-    } in {
-      s = (v6sound fqm).s  ;
-      lock_V = <>
+    } in lin V {
+      s = (v6sound fqm).s
     };
 
   v7 =
     \rootStr ->
     let {
       fcl = mkRoot3 rootStr ;
-      v7fun = v7geminate ; -- TODO add rest
-      } in lin V (v7fun fcl) ;
+      verb : Verb = case rootStr of {
+        f@? + c@? + "ّ" => v7geminate (f+c+c) ;
+        _               => v7sound fcl }
+      } in lin V verb ;
 
   v8 =
     \rootStr ->
     let {
-      rbT = mkRoot3 rootStr ;
-      v8fun = case rbT.f of {
-                ("و"|"ي"|"ّ") => v8assimilated ;
-                _ =>
-                  case rbT.c of {
-                        #weak => v8hollow ;
-                        _     => v8sound }}
-      } in lin V (v8fun rbT) ;
+      fcl = mkRoot3 rootStr ;
+      verb : Verb  = case rootStr of {
+          f@? + c@? + "ّ" => v8geminate (f+c+c) ;
+          #weak + ? + ?   => v8assimilated fcl ;
+          ? + #weak + ?   => v8hollow fcl ;
+          _               => v8sound fcl }
+      } in lin V verb ;
 
   v10 =
     \rootStr ->
     let {
-      rbT = mkRoot3 rootStr ;
-      v10fun : Root3 -> Verb = case rootStr of {
-                ? + #weak + ? => v10hollow ;
-                ? + ? + #weak => v10defective ;
-                _             => v10sound }
-      } in lin V (v10fun rbT) ;
+      fcl = mkRoot3 rootStr ;
+      verb : Verb = case rootStr of {
+          f@? + c@? + "ّ" => v10geminate (f+c+c) ;
+          ? + #weak + ?   => v10hollow fcl ;
+          ? + ? + #weak   => v10defective fcl ;
+          _               => v10sound fcl }
+      } in lin V verb ;
+
+  v11 =
+    \rootStr ->
+    let fcl : Root3 = case rootStr of {
+          f@? + c@? + l@? + b@? => {f=f ; c=c+"ْ"+l ; l=b} ;
+          _ => Predef.error "v11: implement quadriliterals properly"
+        } ;
+        verb : Verb  = case rootStr of {
+          _ => v11sound fcl -- TODO more cases?
+        } ;
+    in lin V verb ;
 
   reflV v = lin V (ResAra.reflV v) ;
 
+  mkFullN : NTable -> Gender -> Species -> N ; -- This is used for loan words or anything that has untreated irregularities in the interdigitization process of its words
   mkFullN nsc gen spec = lin N
     { s = nsc; --NTable
       s2 = emptyNTable;
@@ -514,10 +586,15 @@ resource ParadigmsAra = open
 
   brkN' : Str -> Str -> Str -> Gender -> Species -> N =
     \root,sg,pl,gen,spec ->
-    let { kitAb = mkWord sg root;
+    let { kitAb = case root of {
+            ? + ? + "ي" => mkDefectiveAlifMaqsura (mkPat sg) (mkRoot3 root) ;
+            _           => mkWord sg root };
           kutub = mkWord pl root
     } in mkFullN (reg kitAb kutub) gen spec;
 
+
+--Takes a root string, a singular pattern string, a broken plural
+--pattern string, a gender, and species. Gives a noun.
   brkN root sg pl gen spec =
     let { raw = brkN' root sg pl gen spec} in raw **
     { s = \\n,d,c =>
@@ -528,14 +605,15 @@ resource ParadigmsAra = open
     };
 
   sdfN =
-    \root,sg,gen,spec ->
-    let { kalimaStr = mkWord sg root;
-          kalimaRaw = sndf kalimaStr;
-          kalima : NTable = \\n,d,c => case root of {
-            _ + #hamza + _
-              => rectifyHmz (kalimaRaw ! n ! d ! c);
-            _ => kalimaRaw ! n ! d ! c
-        };
+    \root,sg,gen,spec -> let {
+      kalimaStr = case root of {
+        x@? + y@? + "ي" => mkDefectiveAlifMaqsura (mkPat sg) (mkRoot3 root) ;
+        _               => mkWord sg root } ;
+      kalimaRaw : NTable = case gen of {
+            Fem  =>    sndf kalimaStr ;
+            Masc => sgMsndf kalimaStr } ; -- TODO this isn't actually the case of gender, add an argument
+      kalima : NTable = \\n,d,c =>
+         rectifyHmz (kalimaRaw ! n ! d ! c)
     } in mkFullN kalima gen spec;
 
   sdmN =
@@ -543,6 +621,7 @@ resource ParadigmsAra = open
     let { mucallim = mkWord sg root;
     } in mkFullN (sndm mucallim) gen spec;
 
+  mkFullPN : Str -> Gender -> Species -> PN ;
   mkFullPN = \str,gen,species ->
     { s = \\c => str + indecl!c ;
       g = gen;
@@ -551,21 +630,28 @@ resource ParadigmsAra = open
     };
 
   mkN2 = overload {
-    mkN2 : N -> Preposition -> N2 = prepN2 ;
+    mkN2 : N -> Prep -> N2 = prepN2 ;
     mkN2 : N -> Str -> N2 = \n,s -> prepN2 n (mkPreposition s);
-    mkN2 : N -> N2 = \n -> lin N2 (n ** {c2 = noPrep}) ;
-    mkN2 : Str -> N2 = \str -> lin N2 (smartN str ** {c2 = noPrep})
+    mkN2 : N -> N2 = \n -> prepN2 n genPrep;
+    mkN2 : Str -> N2 = \str -> prepN2 (smartN str) genPrep;
   } ;
 
   prepN2 : N -> Preposition -> N2 = \n,p -> lin N2 (n ** {c2 = p}) ;
 
   mkN3 = overload {
-    mkN3 : N -> Preposition -> Preposition -> N3 = \n,p,q ->
+    mkN3 : N -> Prep -> Prep -> N3 = \n,p,q ->
       lin N3 (n ** {c2 = p ; c3 = q}) ;
     mkN3 : N -> Str -> Str -> N3 = \n,p,q ->
       lin N3 (n ** {c2 = mkPreposition p ; c3 = mkPreposition q}) ;
   } ;
 
+  mkConj = overload {
+    mkConj : Str -> Conj = \s -> lin Conj {s1 = [] ; s2 = s ; n = Sg} ;
+    mkConj : Str -> Str -> Conj = \s1,s2 -> lin Conj {s1 = s1 ; s2 = s2 ; n = Sg} ;
+    mkConj : Str -> Number -> Conj = \s,n -> lin Conj {s1 = [] ; s2 = s ; n = n} ;
+    mkConj : Str -> Str -> Number -> Conj = \s1,s2,n -> lin Conj {s1 = s1 ; s2 = s2 ; n = n}
+    } ;
+
   mkPron : (_,_,_ : Str) -> PerGenNum -> Pron = \ana,nI,I,pgn ->
     lin Pron (ResAra.mkPron ana nI I pgn) ;
 
@@ -573,53 +659,44 @@ resource ParadigmsAra = open
 
 
   mkQuant7 : (_,_,_,_,_,_,_ : Str) -> State -> Quant =
-    \hava,havihi,havAn,havayn,hAtAn,hAtayn,hA'ulA,det -> lin Quant (baseQuant **
-    { s = \\n,s,g,c =>
-        case <s,g,c,n> of {
-          <_,Masc,_,Sg>  => hava;
-          <_,Fem,_,Sg>   => havihi;
-          <_,Masc,Nom,Dl>=> havAn;
-          <_,Masc,_,Dl>  => havayn;
-          <_,Fem,Nom,Dl> => hAtAn;
-          <_,Fem,_,Dl>   => hAtayn;
-          <Hum,_,_,Pl>   => hA'ulA;
-          _              => havihi
-        };
-      d = det
-    });
+    \hava,havihi,havAn,havayn,hAtAn,hAtayn,hA'ulA,det ->
+    lin Quant (ResAra.mkQuant7 hava havihi havAn havayn hAtAn hAtayn hA'ulA det) ;
 
   mkQuant3 : (_,_,_ : Str) -> State -> Quant =
-    \dalika,tilka,ula'ika,det -> lin Quant (baseQuant **
-    { s = \\n,s,g,c =>
-        case <s,g,c,n> of {
-          <_,Masc,_,Sg>  => dalika;
-          <_,Fem,_,Sg>   => tilka;
-          <Hum,_,_,_>   => ula'ika;
-          _              => tilka
-        };
-      d = det
-    });
+    \dalika,tilka,ula'ika,det ->
+    lin Quant (ResAra.mkQuant3 dalika tilka ula'ika det) ;
 
-  brkA : (root,sg,pl : Str) -> Adj = \root,sg,pl ->
+  brkA : (root,sg,pl : Str) -> Adj -- also broken feminine
+    = brkABool False ;
+
+  brkABool : Bool -> (root,sg,pl : Str) -> Adj = \isSndFem,root,sg,pl ->
     let jadId  = mkWord sg root ;
         jadIda = jadId + "َة" ;
         judud  = mkWord pl root ;
+        jadIdAt = case isSndFem of {
+                    True => jadId + "َات" ;
+                    False => judud
+                  } ;
         akbar  = mkWord "أَفعَل" root ;
         mascTbl = reg jadId judud ;
-        femTbl = reg jadIda judud ;
-     in { s = table {
-             APosit Masc n d c => rectifyHmz (mascTbl ! n ! d ! c) ;
-             APosit Fem  n d c => rectifyHmz (femTbl ! n ! d ! c) ;
-             AComp d c         => rectifyHmz (indeclN akbar ! d ! c) }
-        } ;
+        femTbl = reg jadIda jadIdAt ;
+       in { s = table {
+               APosit Masc n d c => rectifyHmz (mascTbl ! n ! d ! c) ;
+               APosit Fem  n d c => rectifyHmz (femTbl ! n ! d ! c) ;
+               AComp d c         => rectifyHmz (indeclN akbar ! d ! c) }
+          } ;
 
-  degrA : (posit,compar,plur : Str) -> A
-    = \posit,compar,plur -> lin A {s = clr posit compar plur} ;
+  degrA : (masc,fem,plur : Str) -> A
+    = \masc,fem,plur -> lin A {s = clr masc fem plur} ;
 
+  idaafaA : N -> A -> A = \ghayr,tayyib -> tayyib ** {
+    s = table {
+      APosit g n d c => ghayr.s ! n ! Const ! c ++ tayyib.s ! APosit g n d c ;
+      AComp d c => ghayr.s ! Sg ! Const ! c ++ tayyib.s ! AComp d c }
+    } ;
 
-
-  sndA root pat =
-    let  raw = sndA' root pat in {
+  sndA : Str -> Str -> A = \root,pat ->
+    let  raw = sndA' root pat in lin A {
       s = \\af =>
         case root of {
           _ + #hamza + _ => rectifyHmz(raw.s ! af);
@@ -645,24 +722,31 @@ resource ParadigmsAra = open
       x => m.s ! x }
     } ;
 
-  nisbaA : Str -> Adj = \Haal ->
-    let Haaliyy = Haal + "ِيّ" in {
+  invarGenderA = \m ->
+    irregFemA m m ;
+
+  nisbaA Haal =
+    let Haaliyy : Str = case Haal of {
+          x + "يّ"      => Haal ; -- if the ending is already given, don't add it
+          x + ("ا"|"ة") => x + "ِيّ" ; -- drop final alif or ta marbuta
+          _             => Haal + "ِيّ"
+        } in lin A {
       s = table {
         APosit g n d c  => positAdj Haaliyy ! g ! n ! d ! c ;
         AComp d c => "أَكْثَر" ++ indeclN Haaliyy ! d ! c
         }
     } ;
 
-  clrA root =
+  clrA : Str -> A = \root ->
     let { eaHmar = mkWord "أَفعَل" root;
           HamrA' = mkWord "فَعلاء" root;
           Humr   = mkWord "فُعل" root
-    } in {
+    } in lin A {
       s = clr eaHmar HamrA' Humr;
     };
 
   mkA2 = overload {
-    mkA2 : A -> Preposition -> A2 = prepA2 ;
+    mkA2 : A -> Prep -> A2 = prepA2 ;
     mkA2 : A -> Str -> A2 = \a,p -> prepA2 a (mkPreposition p)
     } ;
 
@@ -678,10 +762,10 @@ resource ParadigmsAra = open
     mkSubj : Str -> Order -> Subj = \s,o -> lin Subj {s = s ; o = o} ;
   } ;
 
-  dirV2 v = prepV2 v (casePrep acc) ;
+  dirV2 v = prepV2 v accPrep ;
 
   mkV3 = overload {
-    mkV3 : V -> Preposition -> Preposition -> V3 = \v,p,q ->
+    mkV3 : V -> Prep -> Prep -> V3 = \v,p,q ->
       lin V3 (prepV3 v p q) ;
     mkV3 : V -> Str -> Str -> V3 = \v,p,q ->
       lin V3 (v ** {s = v.s ; c2 = mkPreposition p ; c3 = mkPreposition q})
@@ -691,34 +775,61 @@ resource ParadigmsAra = open
     v ** {s = v.s ; c2 = p ; c3 = q} ;
 
   dirV3 = overload {
-    dirV3 : V -> Preposition -> V3 = \v,p -> mkV3 v (casePrep acc) p ;
+    dirV3 : V -> Prep -> V3 = \v,p -> mkV3 v (casePrep acc) p ;
     dirV3 : V -> Str -> V3 = \v,s -> mkV3 v (casePrep acc) (mkPreposition s)
     } ;
 
   dirdirV3 v = dirV3 v (casePrep acc) ;
 
-  mkVS  v = v ** {lock_VS = <>} ;
-  mkVQ  v = v ** {lock_VQ = <>} ;
+  mkVS = overload {
+    mkVS : V -> VS = \v -> lin VS (v ** {o = Subord; s2 = anna}) ;
+    mkVS : V -> Str -> VS =  \v,s -> lin VS (v ** {o = Subord; s2 = s})
+    } ;
+  mkVQ v = lin VQ v ;
 
-  regVV : V -> VV = \v -> lin VV v ** {c2 = mkPreposition "أَنْ" ; sc = noPrep} ;
-  c2VV : V -> Str -> VV = \v,prep -> regVV v ** {c2 = mkPreposition prep ; sc = noPrep} ;
-  prepVV : V -> Preposition -> VV = \v,prep -> regVV v ** {c2=prep; sc=noPrep} ;
-  prep2VV : V -> (_,_ : Preposition) -> VV = \v,p1,p2 -> regVV v ** {c2=p1; sc=p2} ;
+  -- Complementisers for V*V and V*S
+  an : Str = "أَنْ" ;
+  anna : Str = "أَنَّ" ;
+
+  regVV : V -> VV = \v -> lin VV v ** {s2=an ; sc=noPrep} ;
+  s2VV : V -> Str -> VV = \v,compl -> regVV v ** {s2=compl; sc=noPrep} ;
+  prepVV : V -> Prep -> VV = \v,prep -> regVV v ** {s2=an ; sc=prep} ;
+  prep2VV : V -> Prep -> Str -> VV = \v,p,c -> regVV v ** {s2=c; sc=p} ;
   V0 : Type = V ;
 ----  V2S, V2V, V2Q, V2A : Type = V2 ;
   AS, A2S, AV : Type = A ;
   A2V : Type = A2 ;
 
   mkV0  v = v ;
-  mkV2S v p = lin V2S (prepV2 v (mkPreposition p)) ;
+  mkV2S = overload {
+    mkV2S : V -> V2S
+      = \v -> lin V2S (prepV2 v accPrep ** {s2=anna ; o=Subord}) ;
+    mkV2S : V2 -> V2S
+      = \v2 -> lin V2S (v2 ** {s2=anna ; o=Subord}) ;
+    mkV2S : V -> Preposition -> V2S
+      = \v,p -> lin V2S ((prepV2 v p) ** {s2=anna ; o=Subord})
+    } ;
+
   mkV2V = overload {
-    mkV2V : V -> Str -> Str -> V2V = \v,p,q ->
-      lin V2V (prepV3 v (mkPreposition p) (mkPreposition q) ** {sc = noPrep}) ;
-    mkV2V : V -> Preposition -> Preposition -> V2V = \v,p,q ->
-      lin V2V (prepV3 v p q ** {sc = noPrep}) ;
-    mkV2V : VV -> Preposition -> V2V = \vv,p ->
-      lin V2V (vv ** {c2 = p ; c3 = vv.c2}) ;
+    mkV2V : V -> V2V = \v ->
+      lin V2V (v ** {c2=accPrep ; s2=an ; sc=noPrep}) ;
+    mkV2V : VV -> V2V = \vv ->
+      lin V2V (vv ** {c2 = accPrep}) ;
+    mkV2V : VV -> Prep -> V2V = \vv,p ->
+      lin V2V (vv ** {c2 = p}) ;
+    mkV2V : V -> Prep -> Str -> V2V = \v,p,q ->
+      lin V2V (v ** {c2 = p ; s2 = q ; sc = noPrep}) ;
+    mkV2V : V2 -> V2V = \v2 ->
+      lin V2V (v2 ** {s2 = an ; sc = noPrep}) ;
+    mkV2V : V2 -> Str -> V2V = \v2,c ->
+      lin V2V (v2 ** {c2 = v2.c2 ; s2 = c ; sc = noPrep}) ;
   } ;
+
+  subjCase = overload {
+    subjCase : VV -> Prep -> VV = \vv,p -> vv ** {sc=p} ;
+    subjCase : V2V -> Prep -> V2V = \vv,p -> vv ** {sc=p}
+  } ;
+
   mkVA  v   = v ** {lock_VA = <>} ;
   mkV2A v p = lin V2A (prepV2 v (mkPreposition p));
   mkV2Q v p = lin V2Q (prepV2 v (mkPreposition p));
@@ -742,18 +853,19 @@ smartPN : Str -> PN = \s -> case last s of {
   } ;
 
 formV : (root : Str) -> VerbForm -> V = \s,f -> case f of {
-   FormI   => v1 s a u ;
-   FormII  => v2 s ;
-   FormIII => v3 s ;
-   FormIV  => v4 s ;
-   FormV   => v5 s ;
-   FormVI  => v6 s ;
+   FormI    => v1 s a u ;
+   FormII   => v2 s ;
+   FormIII  => v3 s ;
+   FormIV   => v4 s ;
+   FormV    => v5 s ;
+   FormVI   => v6 s ;
    FormVII  => v7 s ;
    FormVIII => v8 s ;
-   FormX   => v10 s
+   FormX    => v10 s ;
+   FormXI   => v11 s
    } ;
 
 param VerbForm =
-  FormI | FormII |  FormIII |  FormIV |  FormV |  FormVI | FormVII | FormVIII | FormX ;
+  FormI | FormII | FormIII | FormIV | FormV | FormVI | FormVII | FormVIII | FormX | FormXI ;
 
 } ;

src/arabic/PatternsAra.gf

@@ -47,6 +47,8 @@ flags coding=utf8 ;
     eafcilp  = { h = "أَ"; m1 = "ْ"   ; m2 = "ِ"   ; t = "َة" } ;
     eafcal   = { h = "أَ"; m1 = "ْ"   ; m2 = "َ"   ; t = ""   } ;
     eafcAl   = { h = "أَ"; m1 = "ْ"   ; m2 = "َا"  ; t = ""   } ;
+    eifcAl   = { h = "إِ"; m1 = "ْ"   ; m2 = "َا"  ; t = ""   } ;
+    eIfcAl   = eifcAl ** {h = "إِي"} ;
     eafcil   = { h = "أَ"; m1 = "ْ"   ; m2 = "ِ"   ; t = ""   } ;
     eafcul   = { h = "أَ"; m1 = "ْ"   ; m2 = "ُ"   ; t = ""   } ;
     eiftacal = { h = "إِ"; m1 = "ْتَ" ; m2 = "َ"   ; t = ""   } ;
@@ -57,8 +59,6 @@ flags coding=utf8 ;
     ufIc     = fIc ** { h = "ُ" } ;
     ufac     = fac ** { h = "ُ" } ;
     ufAc     = fAc ** { h = "ُ" } ;
-    euftucil = { h = "أُ"; m1 = "ْتُ" ; m2 = "ِ"   ; t = ""   } ;
-    euttucil = euftucil ** { h =  "اُتُّ" ; m1 = "ِ"  } ; ---- IL assimilated VIII
     afcul    = { h = "َ" ; m1 = "ْ"   ; m2 = "ُ"   ; t = ""   } ;
     faccalo  = { h = ""  ; m1 = "َ"   ; m2 = "َّ"  ; t = "ْ"  } ;
     facal    = { h = ""  ; m1 = "َ"   ; m2 = "َ"   ; t = ""   } ;
@@ -84,15 +84,23 @@ flags coding=utf8 ;
     fcil     = { h = ""  ; m1 = "ْ"   ; m2 = "ِ"   ; t = ""   } ;
     fcul     = { h = ""  ; m1 = "ْ"   ; m2 = "ُ"   ; t = ""   } ;
     ficl     = { h = ""  ; m1 = "ِ"   ; m2 = "ْ"   ; t = ""   } ;
+    fcIl     = fcil ** {m2 = "ِي"} ;
+    fcAl     = fcal ** {m2 = "َا"} ;
     ficAl    = { h = ""  ; m1 = "ِ"   ; m2 = "َا"  ; t = ""   } ;
     ficlp    = { h = ""  ; m1 = "ِ"   ; m2 = "ْ"   ; t = "َة" } ;
+    ftacc    = facc ** {m1 = "ْتَ"} ;
+    ftucc    = facc ** {m1 = "ْتُ"} ;
     ftacal   = { h = ""  ; m1 = "ْتَ" ; m2 = "َ"   ; t = ""   } ;
+    fticAl   = ficAl ** { m1 = "ْتِ" } ; -- IL hollow VIII
     ftical   = ftacal ** { m1 = "ْتِ" } ; -- IL hollow VIII
     ftAcal   = ftacal ** { m1 = "ْتَا" } ; -- IL hollow VIII
     ftIcal   = ftacal ** { m1 = "ْتِي" } ;  -- IL hollow VIII
     ftacil   = { h = ""  ; m1 = "ْتَ" ; m2 = "ِ"   ; t = ""   } ;
+    ftucil   = fucil ** { m1 = "ْتُ" } ;
+    euttucil = { h =  "اُتُّ" ; m1 = "ِ" ; m2 = "" ; t = "" } ; ---- IL assimilated VIII
     ttacal   = ftacal ** { m1 = ""  ; h = "تَّ" } ; ---- IL assimilated VIII
     ttacil   = ftacil ** { m1 = ""  ; h = "تَّ" } ; ---- IL assimilated VIII
+    tticAl   = ficAl ** { h = "تِّ" } ;             ---- IL assimilated VIII
     fuccAl   = { h = ""  ; m1 = "ُ"   ; m2 = "َّا" ; t = ""   } ;
     fuccil   = { h = ""  ; m1 = "ُ"   ; m2 = "ِّ"  ; t = ""   } ;
     fuccilo  = { h = ""  ; m1 = "ُ"   ; m2 = "ِّ"  ; t = "ْ"  } ;
@@ -110,7 +118,9 @@ flags coding=utf8 ;
     mafcUl   = { h = "مَ"; m1 = "ْ"   ; m2 = "ُو"  ; t = ""   } ;
     mafcil   = { h = "مَ"; m1 = "ْ"   ; m2 = "ِ"  ; t = ""   } ;
     tafAcal  = { h = "تَ"; m1 = "َا"  ; m2 = "َ"   ; t = ""   } ;
+    tafAcul  = { h = "تَ"; m1 = "َا"  ; m2 = "ُ"   ; t = ""   } ;
     tafaccal = { h = "تَ"; m1 = "َ"   ; m2 = "َّ"  ; t = ""   } ;
+    tafaccul = { h = "تَ"; m1 = "َ"   ; m2 = "ُّ"  ; t = ""   } ;
     tufuccil = { h = "تُ"; m1 = "ُ"   ; m2 = "ِّ"  ; t = ""   } ;
     tufUcil  = { h = "تُ"; m1 = "ُو"  ; m2 = "ِ"   ; t = ""   } ;
     ufAcal   = { h = "ُ" ; m1 = "َا"  ; m2 = "َ"   ; t = ""   } ;

src/arabic/PhraseAra.gf

@@ -12,13 +12,13 @@ concrete PhraseAra of Phrase = CatAra ** open
     UttImpPl,UttImpPol = \pol,imp -> {s = \\g => imp.s ! pol.p ! g ! ResAra.Pl ++ pol.s} ;
     UttInterj i = {s = \\g => i.s} ;
 
-    UttIP ip = {s = \\g => ip.s ! False ! g ! Def ! Nom} ; --IL
+    UttIP ip = {s = \\g => ip.s ! False ! g ! Const ! Nom} ; --IL
     UttAP ap = {s = ResAra.uttAP ap} ; --IL
     UttCard c = {s = ResAra.uttNum c} ; --IL
 
     UttCN cn = {s = ResAra.uttCN cn } ; --IL
     UttNP np = {s = \\_ => np.s ! Nom} ;
-    UttVP vp = {s = uttVP vp} ; --IL
+    UttVP vp = {s = uttVP VPPerf vp} ; --IL
     UttS s = {s = \\_ => s.s ! Verbal} ;
     UttAdv,
     UttIAdv = \s -> {s = \\_ => s.s} ; ---- OK? AR

src/arabic/QuestionAra.gf

@@ -2,87 +2,99 @@ concrete QuestionAra of Question = CatAra ** open ResAra, ParamX, Prelude, VerbA
 
   flags optimize=all_subs ; coding = utf8 ;
 
-  lin
+lin
+  -- : Cl -> QCl ;            -- does John walk
+  QuestCl cl = {
+    s = \\t,p =>
+      table {
+        QIndir => "إِذا" ++ cl.s ! t ! p ! toOrder QIndir ;
+        QDir => "هَلْ" ++ cl.s ! t ! p ! Verbal -- yes/no question
+      }
+    };
 
-    QuestCl cl = {
-      s = \\t,p =>
-        table {
-          QIndir => "إِذا" ++ cl.s ! t ! p ! toOrder QIndir ;
-          QDir => "هَلْ" ++ cl.s ! t ! p ! toOrder QDir
-        }
-      };
+  -- : IP -> VP -> QCl ;      -- who walks
+  QuestVP qp vp =
+   let np = ip2np qp (case vp.vtype of {Copula=>True ; _=>False}) ;
+       cl = PredVP np vp ;
+    in { s = \\t,p,qf => cl.s ! t ! p ! toOrder qf } ;
 
-    -- ComplSlashIP vps ip = {} ;
-
-    --IL guessed
-    QuestVP qp vp =
-     let np = ip2np qp vp.isPred ;
-         cl = PredVP np vp ;
-      in { s = \\t,p,qf => cl.s ! t ! p ! toOrder qf } ;
-
-
-
----- AR guessed
-   QuestIAdv iadv cl = {s = \\t,p,qf => iadv.s ++ cl.s ! t ! p ! toOrder qf} ;
+  -- QuestIAdv   : IAdv -> Cl -> QCl ;    -- why does John walk
+  QuestIAdv iadv cl = {s = \\t,p,qf => iadv.s ++ cl.s ! t ! p ! Verbal} ; -- Verbal word order, because there is no pre-existing question word /IL
 
 ---- IL guessed
-   -- : IComp -> NP -> QCl
-   QuestIComp ic np =
-     let vp = UseComp (CompNP np) ; -- puts NP in nominative
-         ip : ResAra.IP = np ** { -- NP's s is already present in VP, we only want its agr
-            s = \\_,_,_,_ => ic.s ! pgn2gn np.a.pgn } ;
-      in QuestVP ip vp ;
+  -- : IComp -> NP -> QCl
+  QuestIComp ic np =
+    let vp = UseComp (CompNP np) ; -- puts NP in nominative
+        ip : ResAra.IP = np ** { -- NP's s is already present in VP, we only want its agr
+               s = \\_,_,_,_ => ic.s ! pgn2gn np.a.pgn } ;
+     in QuestVP ip vp ;
 
-   -- : IP   -> IComp ;
-   CompIP ip = ip ** { 
-      s = \\gn => ip.s ! True  -- True=IP will be a subject of predicative sentence
-                       ! gn.g  -- IComp agrees in gender with eventual head
-                       ! Def ! Nom ; -- IP will be a subject
+  -- : IP -> IComp ;
+  CompIP ip = ip ** {
+    s = \\gn => ip.s ! True  -- True=IP will be a subject of predicative sentence
+                     ! gn.g  -- IComp agrees in gender with eventual head
+                     ! Def ! Nom ; -- IP will be a subject
       } ;
 
-   CompIAdv iadv = { s = \\_ => iadv.s ; a = ResAra.Sg } ;
+  -- : IAdv -> IComp ;          -- where (is it)
+  CompIAdv iadv = { s = \\_ => iadv.s ; a = ResAra.Sg } ;
 
-   --  QCl = {s : Tense => Polarity => QForm => Str} ;
-   QuestSlash ip cls = { ----IL just guessing
-      s = \\t,p,qf => 
-        let cl : ResAra.Cl = complClSlash cls ; -- dummy conversion to Cl
+   -- : IP -> ClSlash -> QCl ; -- whom does John love
+  QuestSlash ip cls = {
+    s = \\t,p,qf =>        -- remove cls's c2 so it won't show up in the wrong place
+        let cl : ResAra.Cl = complClSlash (cls ** {c2=noPrep});
             o = toOrder qf
-          in cls.c2.s ++ bindIf cls.c2.binds 
+          in cls.c2.s ++ bindIf cls.c2.binds -- Put cls's c2 ("with") before the IP ("whom")
           ++ ip.s ! False ! Masc ! Def ! Nom
           ++ cl.s ! t ! p ! o
       } ;
 
-  --IL guessed
-  PrepIP p ip = {
-    s = p.s ++ ip.s ! False -- not used as a subject of predicative sentence
-                    ! Masc ----
-                    ! Def ! Gen
+  -- : Prep -> IP -> IAdv ;     -- with whom
+  PrepIP prep ip = {
+    s = prep.s ++ bindIf prep.binds
+        ++ ip.s ! False -- not used as a subject of predicative sentence
+                ! Masc ----
+                ! Def -- not sure /IL
+                ! prep.c
     } ;
 
+  -- : IP -> Adv -> IP ;        -- who in Paris
   AdvIP ip adv = ip ** {
     s = \\isPred,g,s,c => ip.s ! isPred ! g ! s ! c ++ adv.s ;
     } ;
 
-   -- : IDet -> IP
-   IdetIP idet = idet ** { 
-     s = \\isPred => idet.s ;
-     a = { pgn = agrP3 NoHum Masc idet.n ; isPron = False }
-     } ;
+  -- : IAdv -> Adv -> IAdv ;    -- where in Paris
+  AdvIAdv iadv adv = {s = iadv.s ++ adv.s} ;
 
-   -- : IDet -> CN -> IP
-   IdetCN idet cn = {
-     s = \\isPred,g,s,c 
+  -- : IDet -> IP
+  IdetIP idet = idet ** {
+    s = \\isPred => idet.s ;
+    a = { pgn = agrP3 NoHum Masc idet.n ; isPron = False }
+    } ;
+
+  -- : IDet -> CN -> IP
+  IdetCN idet cn = {
+    s = \\isPred,g,s,c
           => idet.s ! cn.g ! s ! c ++
              cn2str cn idet.n idet.d Gen ;
-     a = { pgn = agrP3 NoHum cn.g idet.n ; isPron = False }
-     } ;
+    a = { pgn = agrP3 NoHum cn.g idet.n ; isPron = False }
+    } ;
 
    -- : IQuant -> Num -> IDet
-   IdetQuant iquant num = {
-     s = \\g,s,c =>
+  IdetQuant iquant num = {
+    s = \\g,s,c =>
           let gend = detGender g num.n -- gender flips with some numbers
           in  iquant.s ! s ! c ++ num.s ! gend ! s ! c ;
-     n = sizeToNumber num.n ;
-     d = Indef ---- TODO check
-     } ;
+    n = sizeToNumber num.n ;
+    d = Indef ---- TODO check
+    } ;
+
+-- IL guessed all following
+lincat
+  QVP = ResAra.VP ;          -- buy what where
+lin
+  ComplSlashIP vps ip = ComplSlash vps (ip2np ip False) ; -- : VPSlash -> IP -> QVP ;   -- buys what
+  AdvQVP = AdvVP ;    -- : VP  -> IAdv -> QVP ;   -- lives where
+  AddAdvQVP = AdvVP ; -- : QVP -> IAdv -> QVP ;   -- buys what where
+  QuestQVP = QuestVP ;   -- : IP -> QVP -> QCl ;  -- who buys what where
 }

src/arabic/README.md

@@ -0,0 +1,33 @@
+# Arabic
+
+## Language info
+
+* English name: Arabic
+* Autonym: العربية
+* ISO code: Ara
+
+## Authors
+
+* Ali El Dada, 2006-2009
+* Aarne Ranta, 200?-
+* Inari Listenmaa, 2018-
+
+## Publications
+
+* A. El Dada and A. Ranta. **Implementing an Open Source Arabic Resource Grammar in GF.**
+In M. Mughazy (ed), *Perspectives on Arabic Linguistics XX. Papers from the Twentieth Annual Symposium on Arabic Linguistics, Kalamazoo, March 26*. John Benjamins Publishing Company. 2007.
+  * An outline of the Arabic resource grammar project, focusing on linguistic aspects.
+
+* A. El Dada. **Implementation of the Arabic Numerals and their Syntax in GF.**
+*Computational Approaches to Semitic Languages: Common Issues and Resources*,
+ACL-2007 Workshop, June 28, 2007, Prague.
+  * A case study with the resource grammar, focusing on the morphosyntax and agreement of constructions with numerals.
+
+## Implementation information
+
+The grammar is for vocalised Arabic.
+
+
+## Maintainer
+
+Inari Listenmaa ([@inariksit](https://github.com/inariksit))

src/arabic/RelativeAra.gf

@@ -1,5 +1,5 @@
 concrete RelativeAra of Relative = CatAra **
-  open ResAra in {
+  open Prelude,ResAra in {
  flags coding=utf8;
 
  lin
@@ -13,7 +13,7 @@ concrete RelativeAra of Relative = CatAra **
      s = \\t,p,agr,c =>
        let
          npS : Case => Str = \\_ => rp.s ! agr2ragr agr c ;
-         np : ResAra.NP = agrNP agr ** {s = npS} ;
+         np : ResAra.NP = agrNP {pgn=agr;isPron=False} ** {s = npS} ;
          cl = predVP np vp ;
        in
        cl.s ! t ! p ! Nominal
@@ -23,7 +23,7 @@ concrete RelativeAra of Relative = CatAra **
    RelSlash rp cls = cls ** {
      s = \\t,p,agr,c =>
         let --empty : Agr -> NP = emptyNP ;
-            obj : ResAra.NP = pgn2pron agr.pgn ; -- head is repeated as a clitic object pronoun
+            obj : ResAra.NP = pgn2pron agr ; -- head is repeated as a clitic object pronoun
             cl : ResAra.Cl = complClSlash obj cls ;
         in rp.s ! agr2ragr agr c ++ cl.s ! t ! p ! VOS
      } ;

src/arabic/SentenceAra.gf

@@ -12,23 +12,8 @@ concrete SentenceAra of Sentence = CatAra ** open
   flags optimize=all_subs ; coding=utf8 ;
 
   lin
-{-
-    PredVP np vp =
-      { s = \\t,p,o =>
-          case o of {
-            Verbal =>
-              case vp.comp.a.isPron of {
-                False => vp.s ! t ! p ! Verbal ! np.a ++ np.s ! Nom ++ vp.comp.s ! Acc ;
-                True  => vp.s ! t ! p ! Verbal ! np.a ++ vp.comp.s ! Acc ++ np.s ! Nom
-              };
-            Nominal =>
-              np.s ! Nom ++ vp.s ! t ! p ! Nominal ! np.a ++ vp.comp.s ! Acc
-          }
-      };
--}
-    PredVP = predVP ;
 
---    PredSCVP sc vp = mkClause sc.s (agrP3 Sg) vp ;
+    PredVP = predVP ;
 
     ImpVP vp = {
       s = \\p,g,n =>
@@ -57,11 +42,9 @@ concrete SentenceAra of Sentence = CatAra ** open
 
 --  SlashVS np vs sslash = TODO
 
-
---    EmbedS  s  = {s = conjThat ++ s.s} ;
---    EmbedQS qs = {s = qs.s ! QIndir} ;
---    EmbedVP vp = {s = infVP False vp (agrP3 Sg)} ; --- agr
---
+    EmbedS  s  = {s = "مَا" ++ s.s ! Verbal} ;
+    EmbedQS qs = {s = qs.s ! QIndir} ;
+    EmbedVP vp = {s = uttVP VPPerf vp ! Masc} ; -- TODO: use VPGer once it's more stable
 
     UseCl t p cl =
       {s = \\o => t.s ++ p.s ++
@@ -83,7 +66,9 @@ concrete SentenceAra of Sentence = CatAra ** open
 
     UseRCl t p cl = {s = \\agr,c => t.s ++ p.s ++ cl.s ! t.t ! p.p ! agr ! c} ;
 
-    UseSlash t p cl = UseCl t p (complClSlash cl) ;
+    -- If the cls has a c2, the preposition will just hang there without an object.
+    -- If this bothers you, call complClSlash to cls ** {c2=noPrep}. /IL
+    UseSlash t p cls = UseCl t p (complClSlash cls) ;
 
     AdvS adv s = s ** {s = \\o => adv.s ++ s.s ! o} ;
 }

src/arabic/StructuralAra.gf

@@ -1,5 +1,5 @@
 concrete StructuralAra of Structural = CatAra **
-  open MorphoAra, ResAra, ParadigmsAra, Prelude in {
+  open MorphoAra, ResAra, ParadigmsAra, (N=NounAra), Prelude in {
 
   flags optimize=all ;  coding=utf8 ;
 
@@ -11,12 +11,12 @@ concrete StructuralAra of Structural = CatAra **
   almost_AdN = ss "حَوَالي" ; -- or  "تَقرِيبا"
 --  although_Subj = ss "َلتهُْغه" ;
 --  always_AdV = ss "َلوَيس" ;
-  and_Conj = ss "وَ" ** {n = Pl} ;
+  and_Conj = mkConj "وَ" Pl ;
 --  because_Subj = ss "بعَُسي" ;
   before_Prep = mkPrep "قَبْلَ" ;
   behind_Prep = mkPrep "خَلْفَ" ;
   between_Prep = mkPrep "بَيْنَ" ;
---  both7and_DConj = sd2 "بْته" "َند" ** {n = Pl} ;
+  both7and_DConj = mkConj "كِلا" "وَ" Pl ;
 --  but_PConj = ss "بُت" ;
   by8agent_Prep,
   by8means_Prep = biPrep ;
@@ -38,19 +38,20 @@ concrete StructuralAra of Structural = CatAra **
   from_Prep = mkPrep "مِنَ" ;
   he_Pron = ResAra.he_Pron ;
   here_Adv = ss "هُنا" ;
---  here7to_Adv = ss ["تْ هري"] ;
---  here7from_Adv = ss ["فرْم هري"] ;
+  here7to_Adv = ss "إلَىَ هُنَا" ;
+  here7from_Adv = ss "مِنْ هُنَا" ;
   how_IAdv = ss "كَيفَ" ;
   how8many_IDet = {
     s = \\g,s,c => "كَمْ عَدَد" + caseTbl ! c ;
     n = Pl ; d = Def
     } ; -- IL
-
+  how8much_IAdv = ss "كَمْ" ;
   if_Subj = mkSubj "إِذَا" Verbal ;
+  --whether_Subj = mkSubj "مَا إِذَا" Verbal ;
   in8front_Prep = mkPrep "مُقَابِلَ" ;
   i_Pron  = ResAra.i_Pron ;
   in_Prep = mkPrep "فِي" ;
-  it_Pron = emptyNP ** {s = \\_ => "هَذَا"} ; -- was: it_Pron = mkPron "ِت" "ِت" "ِتس" (Per3 Masc Sg);
+  it_Pron = N.DetNP (N.DetQuant this_Quant N.NumSg) ; -- was: it_Pron = mkPron "ِت" "ِت" "ِتس" (Per3 Masc Sg);
 --  less_CAdv = ss "لسّ" ;
   many_Det = mkDet "جَمِيع" Pl Const ;
 --  more_CAdv = ss "مْري" ;
@@ -61,24 +62,25 @@ concrete StructuralAra of Structural = CatAra **
 --         ["هَد تْ"] ; ["هَثِنغ تْ"] ; "مُستنءت" ; ["هَدنءت تْ"]] ; ----
 --    isAux = True
 --    } ;
+  nothing_NP = regNP "لَا شَيْء" Sg Def ;
   no_Utt = {s = \\_ => "لا"} ;
   on_Prep = mkPrep "عَلَى" ;
   only_Predet = mkPredet "فَقَط" False;
---  or_Conj = ss "ْر" ** {n = Sg} ;
+  or_Conj = mkConj "أَوْ" ;
 --  otherwise_PConj = ss "ْتهروِسي" ;
   part_Prep = mkPrep "مِنَ" ;
 --  please_Voc = ss "ةلَسي" ;
   possess_Prep = liPrep ;
 --  quite_Adv = ss "قُِتي" ;
   she_Pron = ResAra.she_Pron ;
---  so_AdA = ss "سْ" ;
+  so_AdA = very_AdA ;
   somebody_NP = regNP "أَحَد" Sg Indef ;
-  someSg_Det = mkDet "أَحَد" Sg Const ;
-  somePl_Det = mkDet "بَعض" Pl Const ;
+  someSg_Det = ResAra.someSg_Det ;
+  somePl_Det = ResAra.somePl_Det ;
   something_NP = regNP "شَيْء" Sg Indef ;
 --  somewhere_Adv = ss "سْموهري" ;
   that_Quant = mkQuant3 "ذَلِكَ" "تِلكَ" "أُلٱِكَ" Def;
-  that_Subj = mkSubj "أنَّ" ;
+  that_Subj = mkSubj "أَنَّ" ;
 ----b  that_NP = indeclNP "ذَلِكَ" Sg ;
   there_Adv = ss "هُناك" ;
 --  there7to_Adv = ss "تهري" ;
@@ -86,14 +88,14 @@ concrete StructuralAra of Structural = CatAra **
 --  therefore_PConj = ss "تهرفْري" ;
 ----b  these_NP = indeclNP "هَؤُلَاء" Pl ;
   they_Pron = theyMasc_Pron ;
-  this_Quant = mkQuant7 "هَذا" "هَذِهِ" "هَذَان" "هَذَيْن" "هَاتَان" "هَاتَيْن" "هَؤُلَاء" Def;
+  this_Quant = mkQuant7 "هَذَا" "هَذِهِ" "هَذَان" "هَذَيْن" "هَاتَان" "هَاتَيْن" "هَؤُلَاء" Def ;
 ----b  this_NP = indeclNP "هَذا" Sg ;
 ----b  those_NP = indeclNP "هَؤُلَاءكَ" Pl ;
   through_Prep = mkPrep "عَبْرَ" ;
---  too_AdA = ss "تّْ" ;
+  too_AdA = very_AdA ;
   to_Prep = mkPrep "إِلَى" ;
   under_Prep = mkPrep "تَحْتَ" ;
---  very_AdA = ss "ثري" ;
+  very_AdA = ss "جِدَّاً" ;
   want_VV = mkVV (mkV "رود" FormIV) ;
   we_Pron = ResAra.we_Pron ;
   whatPl_IP = mkIP "ما" "ماذا" Pl ;
@@ -114,15 +116,16 @@ concrete StructuralAra of Structural = CatAra **
     } ;
   whoSg_IP = mkIP "مَنْ" "مَنْ" Sg ;
   whoPl_IP = mkIP "مَنْ" "مَنْ" Pl ;
---  why_IAdv = ss "وهي" ;
+  why_IAdv = ss "لِمَاذَا" ;
   without_Prep = mkPrep "بِدُونِ" ;
-  with_Prep = mkPrep "مَع" ;
+  with_Prep = mkPrep "مَعَ" ;
   yes_Utt = {s = \\_ => "نَعَم"} ;
   youSg_Pron = youSgMasc_Pron ;
   youPl_Pron = youPlMasc_Pron ;
   youPol_Pron = youPlFem_Pron ; -- arbitrary?
 
-  have_V2      = dirV2 (regV "يَملِك") ;
+  have_V2 = mkV2 ladaa_V (casePrep nom) ; -- "X has Y" literally "Y<nom> is on X<nom>"
+  --have_V2 = dirV2 (regV "يَملِك") ; -- "X<nom> owns/possesses Y<acc>"
 
   lin language_title_Utt = {s = \\_ => "العربية"} ;
 

src/arabic/SymbolAra.gf

@@ -14,15 +14,13 @@ lin
   --   } ;
   --IL TODO: check out some opers regarding state in ResAra. These are just dummy values.
   CNSymbNP det cn xs =
-    let g = cn.g ; n = sizeToNumber det.n  in {
+    let g = cn.g ; n = sizeToNumber det.n in emptyNP ** {
     s = \\c => det.s ! NoHum ! g ! c ++ cn2str cn n Def c ++ xs.s; ----IL word order?? Seems to be nontrivial according to ResAra comments.
-    a = dummyAgrP3 n ;
-    empty = []
+    a = dummyAgrP3 n
     } ;
-  CNNumNP cn i = {
+  CNNumNP cn i = emptyNP ** {
     s = \\c => cn2str cn Sg Def c ++ uttNum i ! cn.g ;
-    a = dummyAgrP3 Sg ;
-    empty = []
+    a = dummyAgrP3 Sg
     } ;
 
   SymbS sy = {s = \\_ => sy.s} ;

src/arabic/VerbAra.gf

@@ -5,17 +5,18 @@ concrete VerbAra of Verb = CatAra ** open Prelude, ResAra, ParamX in {
   lin
     UseV = predV ;
 
-    SlashVV vv vps = vps ** predV vv ; ----IL
+    -- : VV -> VPSlash -> VPSlash
+    SlashVV vv vps = vps ** ComplVV vv vps ;
 
     -- : V2V -> VP -> VPSlash ;  -- beg (her) to go
     SlashV2V v2v vp = let v2vVP = predV v2v in -- IL
       vp ** {
         s = v2vVP.s ;
-        agrObj = \\pgn => v2v.c3.s  -- أَنْ
+        agrObj = \\pgn => v2v.s2  -- أَنْ
                        ++ vp.s ! pgn ! VPImpf Cnj -- this will agree with the object added by ComplSlash
                        ++ vp.obj.s ;
         obj = emptyObj ;
-        isPred = False ;
+        vtype = NotPred ;
         c2 = v2v.c2 ; -- preposition for the direct object
         sc = v2v.sc
       } ;
@@ -25,17 +26,39 @@ concrete VerbAra of Verb = CatAra ** open Prelude, ResAra, ParamX in {
       vps ** {
         s = \\pgn,vpf => v2vVP.s ! pgn ! vpf -- main verb agrees with subject
                       ++ bindIfPron np v2vVP
-                      ++ v2v.c3.s  -- أَنْ
+                      ++ v2v.s2  -- أَنْ
                       ++ vps.s ! np.a.pgn ! VPImpf Cnj -- verb from old VP agrees with object
                       ++ vps.obj.s ; -- otherwise obj appears in a weird place /IL
         obj = emptyObj ;
-        isPred = False ;
+        vtype = NotPred ;
                     -- preposition for the direct object comes from VP
         sc = v2v.sc
       } ;
 
+    -- : V2S -> S -> VPSlash ;  -- answer (to him) that it is good
+    SlashV2S v2s s = slashV2 v2s ** { -- IL
+      agrObj = -- this is put into agrObj even though it doesn't depend on agr, because insertObj puts agrObj *after* the new object.
+        \\pgn => v2s.s2 -- أَنَّ
+              ++ s.s ! v2s.o ;
+      } ;
+
     SlashV2a = slashV2 ;
-    Slash3V3 v np = insertObj np (slashV2 v) ** {c2 = v.c3 ; agrObj = \\_ => []};
+    Slash2V3 v np = insertObj np (slashV2 v) ** {c2 = v.c3 ; agrObj = \\_ => []};
+
+    Slash3V3 v np =
+      let vp = slashV2 v ** {c2 =
+            v.c2 ** {
+              s = case np.a.isPron of {
+                    True => case v.c2.binds of {
+                        True  => v.c2.s ; -- to make sure there's something for the object to attach to
+                        False => v.c2.s ++ "إِيَّا" } ; -- see https://en.wiktionary.org/wiki/%D8%A5%D9%8A%D8%A7#Particle /IL
+                    False => v.c2.s }
+            }
+          }
+       in vp ** {
+            c2 = v.c3 ;
+            agrObj = \\_ => bindIfPron np vp -- will be emptied when insertObj is called /IL
+          } ;
 
     ComplSlash vp np = insertObj np vp ;
 
@@ -43,15 +66,16 @@ concrete VerbAra of Verb = CatAra ** open Prelude, ResAra, ParamX in {
     ComplVV vv vp = let vvVP = predV vv in -- IL
       vp ** {
         s = \\pgn,vpf => vvVP.s ! pgn ! vpf
-                      ++ vv.c2.s  -- أَنْ
+                      ++ vv.s2  -- أَنْ
                       ++ vp.s ! pgn ! VPImpf Cnj ;
-        isPred = False ;
+        vtype = NotPred ;
         sc = vv.sc
       } ;
 
     -- : VS -> S -> VP ;  -- say that she runs
     ComplVS vs s = predV vs ** { -- IL
-      obj = emptyObj ** {s = s.s ! Subord} 
+      obj = emptyObj ** {s = vs.s2 -- أَنَّ
+                          ++ s.s ! vs.o}
       } ;
 
     -- : VQ -> QS -> VP ;  -- wonder who runs
@@ -68,7 +92,7 @@ concrete VerbAra of Verb = CatAra ** open Prelude, ResAra, ParamX in {
     UseComp xabar =
       case xabar.isNP of {
         False => kaan xabar ;
-        True  => predV copula ** {obj = xabar.obj ; isPred=True} 
+        True  => predV copula ** {obj = xabar.obj ; vtype=Copula}
       } ;
 
     UseCopula = predV copula ;
@@ -76,19 +100,25 @@ concrete VerbAra of Verb = CatAra ** open Prelude, ResAra, ParamX in {
     -- : VP -> Prep -> VPSlash ;  -- live in (it)
     VPSlashPrep vp prep = vp ** {
       c2 = prep ;
-      agrObj = \\_ => []
+      agrObj = \\_ => [] -- to make it into VPSlash, VP didn't have that field before
       } ;
 
     AdvVP vp adv = insertStr adv.s vp ;
 
     AdVVP adv = insertStr adv.s ;
     AdVVPSlash adv vps = vps ** insertStr adv.s vps ;
---
---    ReflV2 v = insertObj (\\a => v.c2 ++ reflPron ! a) (predV v) ;
---
+
+    -- : VPSlash -> VP ;         -- love himself
+    ReflVP vps = vps ** {
+      s = \\pgn,vf => vps.s ! pgn ! vf
+                   ++ vps.obj.s -- only relevant if the VPSlash has been through VPSlashPrep
+                   ++ vps.c2.s ++ bindIf vps.c2.binds
+                   ++ reflPron vps.c2.c pgn ;
+      c2 = accPrep ;
+      obj = emptyObj ; -- because old obj was moved in s
+      } ;
+
     PassV2 = passPredV ;
---
---    UseVS, UseVQ = \vv -> {s = vv.s ; c2 = [] ; isRefl = vv.isRefl} ; -- no
 
     CompAP ap = {s   = \\agr,c => ap.s ! Hum ! agr.g ! agr.n ! Indef ! c ; --FIXME
                  obj = emptyObj ; isNP = False} ;
@@ -97,7 +127,9 @@ concrete VerbAra of Verb = CatAra ** open Prelude, ResAra, ParamX in {
 
     CompCN cn = {s = \\agr,c => cn2str cn agr.n Indef Nom ;
                  obj = emptyObj ; isNP = False} ;
-    CompNP np = {s = \\_,_ => [] ; obj = np ** {s = np.s ! Nom} ; isNP = True} ;
+    CompNP np = {s = \\_,_ => [] ;
+                 obj = {s = np.s ! Nom ; a = agrLite np.a} ;
+                 isNP = True} ;
 --
 --
 }

src/bantu/CatBantu.gf

@@ -1,5 +1,5 @@
 incomplete concrete CatBantu of Cat =
-  CommonX - [Pol]
+  CommonX
   ** open ResBantu, Prelude, ParamX in {
 
   flags optimize=all_subs ;
@@ -7,8 +7,6 @@ incomplete concrete CatBantu of Cat =
 
   lincat
 
- Pol = {s : Str ; b : Bool} ;
-  
     S  = {s : Str} ;
     QS = {s : QForm => Str} ;
     RS = {s : Agr => Str ; c : NPCase} ; -- c for it clefts
@@ -16,7 +14,7 @@ incomplete concrete CatBantu of Cat =
 
 -- Sentence
 
-  --  Cl = {s : Tense => Anteriority => Bool =>  Str} ;
+    Cl = {s : Tense => Anteriority => Bool =>  Str} ;
  --   ClSlash = {
  --     s : ResKam.Tense => Anteriority => Bool => Str ;
 --      } ;

src/bantu/ResBantu.gf

@@ -11,6 +11,7 @@ flags
 oper
   npNom : NPCase = NCase Nom ;
   npLoc : NPCase = NCase Loc ;
+  NPAcc : NPCase = NCase Nom ; -- Added this so that swahili compiles. /IL2020
   npcase2case : NPCase -> Case = \nc -> case nc of {NCase c => c ; _ => Nom} ;
 
 
@@ -81,14 +82,3 @@ oper
   finalComma : Str = pre {"," | "." => []; "" => SOFT_BIND ++ ","; _ => []} ;
   frontComma : Str = SOFT_BIND ++ "," ; 
 }
-
--- insertObject:
--- p -cat=Cl -tr "la femme te l' envoie"
--- PredVP (DetCN (DetSg DefSg NoOrd) (UseN woman_N)) 
---  (ComplV3 send_V3 (UsePron he_Pron) (UsePron thou_Pron))
--- la femme te l' a envoyé
---
--- p -cat=Cl -tr "la femme te lui envoie"
--- PredVP (DetCN (DetSg DefSg NoOrd) (UseN woman_N)) 
---   (ComplV3 send_V3 (UsePron thou_Pron) (UsePron he_Pron))
--- la femme te lui a envoyée

src/bantu/SentenceBantu.gf

@@ -1,14 +1,10 @@
 incomplete concrete SentenceBantu of Sentence = 
   CatBantu ** open Prelude, CommonBantu, ResBantu in {
-{-
-  flags optimize=all_subs ;
-    coding=utf8 ;
 
   lin
 
-                         
-  PredVP np vp = mkClause (np.s ! npNom) np.a vp ;
-
+  PredVP np vp = mkClause (np.s ! npNom) (agrFeatures np.a) vp ;
+{-
     PredSCVP sc vp = mkClause sc.s (agrP3 Sg) vp ;
 
     ImpVP vp = {
@@ -43,11 +39,12 @@ incomplete concrete SentenceBantu of Sentence =
     EmbedS  s  = {s = conjThat ++ s.s} ;
     EmbedQS qs = {s = qs.s ! QIndir} ;
     EmbedVP vp = {s = infVP VVInf vp Simul CPos (agrP3 Sg)} ; --- agr
-    UseCl  t p cl = {
-      s = t.s ++ p.s ++ cl.s ! t.t ! t.a ! p.b  } ;
+-}
+    UseCl  t p cl =
+      let b : Bool = case p.p of {Pos => True ; _ => False}
+      in {s = t.s ++ p.s ++ cl.s ! t.t ! t.a ! b} ;
 
-   -- UseCl t p cl = {s = t.s ++ p.s ++ cl.s ! t.t ! p.b} ; 
-   UseQCl t p cl = {
+{-   UseQCl t p cl = {
       s = \\q => t.s ++ p.s ++ cl.s ! t.t ! t.a ! ctr p.p ! q
     } ;
     UseRCl t p cl = {

src/bantu/VerbBantu.gf

@@ -1,11 +1,9 @@
 incomplete concrete VerbBantu of Verb = 
   CatBantu ** open Prelude, CommonBantu, ResBantu in {
-{-
-  flags optimize=all_subs ;
 
   lin
      UseV = predV ;
-
+{-
     SlashV2a v = predV v ** {c2 = v.c2 ; gapInMiddle = False} ;
     Slash2V3 v np = 
       insertObjc (\\_ => v.c2 ++ np.s ! NPAcc) (predV v ** {c2 = v.c3 ; gapInMiddle = False}) ;