Update documentation for release 3.11

Merge pull request #129 from anka-213/automate-release
Automatically upload release assets after building for release
2026-05-20 08:32:50 -06:00 · 2021-07-25 15:37:12 +08:00 · 2021-07-25 08:20:41 +02:00 · 2021-07-25 11:08:21 +08:00 · 2021-07-25 10:43:36 +08:00 · 2021-07-25 10:30:49 +08:00
63 changed files with 1674 additions and 1436 deletions
--- a/.github/workflows/build-all-versions.yml
+++ b/.github/workflows/build-all-versions.yml
@@ -14,7 +14,7 @@ jobs:
    strategy:
      matrix:
        os: [ubuntu-latest, macos-latest, windows-latest]
-        cabal: ["3.2"]
+        cabal: ["latest"]
        ghc:
          - "8.6.5"
          - "8.8.3"
@@ -33,7 +33,7 @@ jobs:
    - uses: actions/checkout@v2
      if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master'
-    - uses: actions/setup-haskell@v1.1.4
+    - uses: haskell/actions/setup@v1
      id: setup-haskell-cabal
      name: Setup Haskell
      with:
@@ -65,7 +65,7 @@ jobs:
    runs-on: ubuntu-latest
    strategy:
      matrix:
-        stack: ["2.3.3"]
+        stack: ["latest"]
        ghc: ["7.10.3","8.0.2", "8.2.2", "8.4.4", "8.6.5", "8.8.4"]
        # ghc: ["8.8.3"]
@@ -73,11 +73,12 @@ jobs:
    - uses: actions/checkout@v2
      if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master'
-    - uses: actions/setup-haskell@v1.1.4
+    - uses: haskell/actions/setup@v1
      name: Setup Haskell Stack
      with:
-        # ghc-version: ${{ matrix.ghc }}
+        ghc-version: ${{ matrix.ghc }}
-        stack-version: ${{ matrix.stack }}
+        stack-version: 'latest'
        enable-stack: true
    - uses: actions/cache@v1
      name: Cache ~/.stack
--- a/.github/workflows/build-binary-packages.yml
+++ b/.github/workflows/build-binary-packages.yml
@@ -3,6 +3,7 @@ name: Build Binary Packages
 on:
  workflow_dispatch:
  release: 
    types: ["created"]
 jobs:
@@ -10,11 +11,13 @@ jobs:
  ubuntu:
    name: Build Ubuntu package
-    runs-on: ubuntu-18.04
+    strategy:
-    # strategy:
+      matrix:
-    #   matrix:
+        os:
-    #     ghc: ["8.6.5"]
+        - ubuntu-18.04
-    #     cabal: ["2.4"]
+        - ubuntu-20.04
    runs-on: ${{ matrix.os }}
    steps:
    - uses: actions/checkout@v2
@@ -53,19 +56,33 @@ jobs:
    - name: Upload artifact
      uses: actions/upload-artifact@v2
      with:
-        name: gf-${{ github.sha }}-ubuntu
+        name: gf-${{ github.event.release.tag_name }}-${{ matrix.os }}.deb
        path: dist/gf_*.deb
        if-no-files-found: error
    - name: Rename package for specific ubuntu version
      run: |
        mv dist/gf_*.deb dist/gf-${{ github.event.release.tag_name }}-${{ matrix.os }}.deb
    - uses: actions/upload-release-asset@v1.0.2
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
        upload_url: ${{ github.event.release.upload_url }}
        asset_path: dist/gf-${{ github.event.release.tag_name }}-${{ matrix.os }}.deb
        asset_name: gf-${{ github.event.release.tag_name }}-${{ matrix.os }}.deb
        asset_content_type: application/octet-stream
 # ---
  macos:
    name: Build macOS package
    runs-on: macos-10.15
    strategy:
      matrix:
        ghc: ["8.6.5"]
        cabal: ["2.4"]
        os: ["macos-10.15"]
    runs-on: ${{ matrix.os }}
    steps:
    - uses: actions/checkout@v2
@@ -92,19 +109,33 @@ jobs:
    - name: Upload artifact
      uses: actions/upload-artifact@v2
      with:
-        name: gf-${{ github.sha }}-macos
+        name: gf-${{ github.event.release.tag_name }}-macos
        path: dist/gf-*.pkg
        if-no-files-found: error
    - name: Rename package
      run: |
        mv dist/gf-*.pkg dist/gf-${{ github.event.release.tag_name }}-macos.pkg
    - uses: actions/upload-release-asset@v1.0.2
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
        upload_url: ${{ github.event.release.upload_url }}
        asset_path: dist/gf-${{ github.event.release.tag_name }}-macos.pkg
        asset_name: gf-${{ github.event.release.tag_name }}-macos.pkg
        asset_content_type: application/octet-stream
 # ---
  windows:
    name: Build Windows package
    runs-on: windows-2019
    strategy:
      matrix:
        ghc: ["8.6.5"]
        cabal: ["2.4"]
        os: ["windows-2019"]
    runs-on: ${{ matrix.os }}
    steps:
    - uses: actions/checkout@v2
@@ -136,16 +167,18 @@ jobs:
        cp /mingw64/bin/libpgf-0.dll /c/tmp-dist/c
        cp /mingw64/bin/libgu-0.dll /c/tmp-dist/c
    # JAVA_HOME_8_X64 = C:\hostedtoolcache\windows\Java_Adopt_jdk\8.0.292-10\x64
    - name: Build Java bindings
      shell: msys2 {0}
      run: |
-        export PATH="${PATH}:/c/Program Files/Java/jdk8u275-b01/bin"
+        export JDKPATH=/c/hostedtoolcache/windows/Java_Adopt_jdk/8.0.292-10/x64
        export PATH="${PATH}:${JDKPATH}/bin"
        cd src/runtime/java
        make \
-          JNI_INCLUDES="-I \"/c/Program Files/Java/jdk8u275-b01/include\" -I \"/c/Program Files/Java/jdk8u275-b01/include/win32\" -I \"/mingw64/include\" -D__int64=int64_t" \
+          JNI_INCLUDES="-I \"${JDKPATH}/include\" -I \"${JDKPATH}/include/win32\" -I \"/mingw64/include\" -D__int64=int64_t" \
          WINDOWS_LDFLAGS="-L\"/mingw64/lib\" -no-undefined"
        make install
-        cp .libs//msys-jpgf-0.dll /c/tmp-dist/java/jpgf.dll
+        cp .libs/msys-jpgf-0.dll /c/tmp-dist/java/jpgf.dll
        cp jpgf.jar /c/tmp-dist/java
    - name: Build Python bindings
@@ -157,7 +190,7 @@ jobs:
        cd src/runtime/python
        python setup.py build
        python setup.py install
-        cp /usr/lib/python3.8/site-packages/pgf* /c/tmp-dist/python
+        cp /usr/lib/python3.9/site-packages/pgf* /c/tmp-dist/python
    - name: Setup Haskell
      uses: actions/setup-haskell@v1
@@ -180,6 +213,18 @@ jobs:
    - name: Upload artifact
      uses: actions/upload-artifact@v2
      with:
-        name: gf-${{ github.sha }}-windows
+        name: gf-${{ github.event.release.tag_name }}-windows
        path: C:\tmp-dist\*
        if-no-files-found: error
    - name: Create archive
      run: |
        Compress-Archive C:\tmp-dist C:\gf-${{ github.event.release.tag_name }}-windows.zip
    - uses: actions/upload-release-asset@v1.0.2
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
        upload_url: ${{ github.event.release.upload_url }}
        asset_path: C:\gf-${{ github.event.release.tag_name }}-windows.zip
        asset_name: gf-${{ github.event.release.tag_name }}-windows.zip
        asset_content_type: application/zip
--- a/41
+++ b/41
@@ -1,31 +1,48 @@
-.PHONY: all build install doc clean gf html deb pkg bintar sdist
+.PHONY: all build install doc clean html deb pkg bintar sdist
 # This gets the numeric part of the version from the cabal file
 VERSION=$(shell sed -ne "s/^version: *\([0-9.]*\).*/\1/p" gf.cabal)
 # Check if stack is installed
 STACK=$(shell if hash stack 2>/dev/null; then echo "1"; else echo "0"; fi)
 # Check if cabal >= 2.4 is installed (with v1- and v2- commands)
 CABAL_NEW=$(shell if cabal v1-repl --help >/dev/null 2>&1 ; then echo "1"; else echo "0"; fi)
 ifeq ($(STACK),1)
  CMD=stack
 else
  CMD=cabal
  ifeq ($(CABAL_NEW),1)
    CMD_PFX=v1-
  endif
 endif
 all: build
 dist/setup-config: gf.cabal Setup.hs WebSetup.hs
-	cabal configure
+ifneq ($(STACK),1)
 	cabal ${CMD_PFX}configure
 endif
 build: dist/setup-config
-	cabal build
+	${CMD} ${CMD_PFX}build
 install:
-	cabal copy
+ifeq ($(STACK),1)
-	cabal register
+	stack install
 else
 	cabal ${CMD_PFX}copy
 	cabal ${CMD_PFX}register
 endif
 doc:
-	cabal haddock
+	${CMD} ${CMD_PFX}haddock
 clean:
-	cabal clean
+	${CMD} ${CMD_PFX}clean
 	bash bin/clean_html
 gf:
 	cabal build rgl-none
 	strip dist/build/gf/gf
 html::
 	bash bin/update_html
@@ -35,7 +52,7 @@ html::
 deb:
 	dpkg-buildpackage -b -uc
-# Make an OS X Installer package
+# Make a macOS installer package
 pkg:
 	FMT=pkg bash bin/build-binary-dist.sh
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
 gf (3.11) bionic focal; urgency=low
  * GF 3.11
 -- Inari Listenmaa <inari@digitalgrammars.com>  Sun, 25 Jul 2021 10:27:40 +0800
 gf (3.10.4-1) xenial bionic cosmic; urgency=low
  * GF 3.10.4
--- a/debian/rules
+++ b/debian/rules
@@ -16,9 +16,9 @@ override_dh_shlibdeps:
 override_dh_auto_configure:
 	cd src/runtime/c && bash setup.sh configure --prefix=/usr
 	cd src/runtime/c && bash setup.sh build
-	cabal update
+	cabal v1-update
-	cabal install --only-dependencies
+	cabal v1-install --only-dependencies
-	cabal configure --prefix=/usr -fserver -fc-runtime --extra-lib-dirs=$(CURDIR)/src/runtime/c/.libs --extra-include-dirs=$(CURDIR)/src/runtime/c
+	cabal v1-configure --prefix=/usr -fserver -fc-runtime --extra-lib-dirs=$(CURDIR)/src/runtime/c/.libs --extra-include-dirs=$(CURDIR)/src/runtime/c
 SET_LDL=LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:$(CURDIR)/src/runtime/c/.libs
@@ -26,10 +26,10 @@ override_dh_auto_build:
 	cd src/runtime/python && EXTRA_INCLUDE_DIRS=$(CURDIR)/src/runtime/c EXTRA_LIB_DIRS=$(CURDIR)/src/runtime/c/.libs python setup.py build
 	cd src/runtime/java && make CFLAGS="-I$(CURDIR)/src/runtime/c -L$(CURDIR)/src/runtime/c/.libs" INSTALL_PATH=/usr
 	echo $(SET_LDL)
-	-$(SET_LDL) cabal build
+	-$(SET_LDL) cabal v1-build
 override_dh_auto_install:
-	$(SET_LDL) cabal copy --destdir=$(CURDIR)/debian/gf
+	$(SET_LDL) cabal v1-copy --destdir=$(CURDIR)/debian/gf
 	cd src/runtime/c && bash setup.sh copy prefix=$(CURDIR)/debian/gf/usr
 	cd src/runtime/python && python setup.py install --prefix=$(CURDIR)/debian/gf/usr
 	cd src/runtime/java && make INSTALL_PATH=$(CURDIR)/debian/gf/usr install
--- a/doc/gf-developers-old-cabal.t2t
+++ b/doc/gf-developers-old-cabal.t2t
@@ -0,0 +1,201 @@
 GF Developer's Guide: Old installation instructions with Cabal
 This page contains the old installation instructions from the [Developer's Guide ../doc/gf-developers.html].
 We recommend Stack as a primary installation method, because it's easier for a Haskell beginner, and we want to keep the main instructions short.
 But if you are an experienced Haskeller and want to keep using Cabal, here are the old instructions using ``cabal install``.
 Note that some of these instructions may be outdated. Other parts may still be useful.
 == Compilation from source with Cabal ==
 The build system of GF is based on //Cabal//, which is part of the
 Haskell Platform, so no extra steps are needed to install it. In the simplest
 case, all you need to do to compile and install GF, after downloading the
 source code as described above, is
 ```
 $ cabal install
 ```
 This will automatically download any additional Haskell libraries needed to
 build GF. If this is the first time you use Cabal, you might need to run
 ``cabal update`` first, to update the list of available libraries.
 If you want more control, the process can also be split up into the usual
 //configure//, //build// and //install// steps.
 === Configure ===
 During the configuration phase Cabal will check that you have all
 necessary tools and libraries needed for GF. The configuration is
 started by the command:
 ```
 $ cabal configure
 ```
 If you don't see any error message from the above command then you
 have everything that is needed for GF. You can also add the option
 ``-v`` to see more details about the configuration.
 You can use ``cabal configure --help`` to get a list of configuration options.
 === Build ===
 The build phase does two things. First it builds the GF compiler from
 the Haskell source code and after that it builds the GF Resource Grammar
 Library using the already build compiler.  The simplest command is:
 ```
 $ cabal build
 ```
 Again you can add the option ``-v`` if you want to see more details.
 ==== Parallel builds ====
 If you have Cabal>=1.20 you can enable parallel compilation by using
 ```
 $ cabal build -j
 ```
 or by putting a line
 ```
 jobs: $ncpus
 ```
 in your ``.cabal/config`` file. Cabal
 will pass this option to GHC when building the GF compiler, if you
 have GHC>=7.8.
 Cabal also passes ``-j`` to GF to enable parallel compilation of the
 Resource Grammar Library. This is done unconditionally to avoid
 causing problems for developers with Cabal<1.20. You can disable this
 by editing the last few lines in ``WebSetup.hs``.
 === Install ===
 After you have compiled GF you need to install the executable and libraries
 to make the system usable.
 ```
 $ cabal copy
 $ cabal register
 ```
 This command installs the GF compiler for a single user, in the standard
 place used by Cabal.
 On Linux and Mac this could be ``$HOME/.cabal/bin``.
 On Mac it could also be ``$HOME/Library/Haskell/bin``.
 On Windows this is ``C:\Program Files\Haskell\bin``.
 The compiled GF Resource Grammar Library will be installed
 under the same prefix, e.g. in
 ``$HOME/.cabal/share/gf-3.3.3/lib`` on Linux and
 in ``C:\Program Files\Haskell\gf-3.3.3\lib`` on Windows.
 If you want to install in some other place then use the ``--prefix``
 option during the configuration phase.
 === Clean ===
 Sometimes you want to clean up the compilation and start again from clean
 sources. Use the clean command for this purpose:
 ```
 $ cabal clean
 ```
 %=== SDist ===
 %
 %You can use the command:
 %
 %% This does *NOT* include everything that is needed // TH 2012-08-06
 %```
 %$ cabal sdist
 %```
 %
 %to prepare archive with all source codes needed to compile GF.
 === Known problems with Cabal ===
 Some versions of Cabal (at least version 1.16) seem to have a bug that can
 cause the following error:
 ```
 Configuring gf-3.x...
 setup: Distribution/Simple/PackageIndex.hs:124:8-13: Assertion failed
 ```
 The exact cause of this problem is unclear, but it seems to happen
 during the configure phase if the same version of GF is already installed,
 so a workaround is to remove the existing installation with
 ```
 ghc-pkg unregister gf
 ```
 You can check with ``ghc-pkg list gf`` that it is gone.
 == Compilation with make ==
 If you feel more comfortable with Makefiles then there is a thin Makefile
 wrapper arround Cabal for you. If you just type:
 ```
 $ make
 ```
 the configuration phase will be run automatically if needed and after that
 the sources will be compiled.
 %% cabal build rgl-none does not work with recent versions of Cabal
 %If you don't want to compile the resource library
 %every time then you can use:
 %```
 %$ make gf
 %```
 For installation use:
 ```
 $ make install
 ```
 For cleaning:
 ```
 $ make clean
 ```
 %and to build source distribution archive run:
 %```
 %$ make sdist
 %```
 == Partial builds of RGL ==
 **NOTE**: The following doesn't work with recent versions of ``cabal``. //(This comment was left in 2015, so make your own conclusions.)//
 %% // TH 2015-06-22
 %Sometimes you just want to work on the GF compiler and don't want to
 %recompile the resource library after each change. In this case use
 %this extended command:
 %```
 %$ cabal build rgl-none
 %```
 The resource grammar library can be compiled in two modes: with present
 tense only and with all tenses. By default it is compiled with all
 tenses. If you want to use the library with only present tense you can
 compile it in this special mode with the command:
 ```
 $ cabal build present
 ```
 You could also control which languages you want to be recompiled by
 adding the option ``langs=list``. For example the following command
 will compile only the English and the Swedish language:
 ```
 $ cabal build langs=Eng,Swe
 ```
--- a/doc/gf-developers.t2t
+++ b/doc/gf-developers.t2t
@@ -1,6 +1,6 @@
 GF Developers Guide
-2018-07-26
+2021-07-15
 %!options(html): --toc
@@ -15,388 +15,287 @@ you are a GF user who just wants to download and install GF
 == Setting up your system for building GF ==
 To build GF from source you need to install some tools on your
-system: the //Haskell Platform//, //Git// and the //Haskeline library//.
+system: the Haskell build tool //Stack//, the version control software //Git// and the //Haskeline// library.
-**On Linux** the best option is to install the tools via the standard
+%**On Linux** the best option is to install the tools via the standard
-software distribution channels, i.e. by using the //Software Center//
+%software distribution channels, i.e. by using the //Software Center//
-in Ubuntu or the corresponding tool in other popular Linux distributions.
+%in Ubuntu or the corresponding tool in other popular Linux distributions.
 Or, from a Terminal window, the following command should be enough:
- On Ubuntu: ``sudo apt-get install haskell-platform git libghc6-haskeline-dev``
+%**On Mac OS and Windows**, the tools can be downloaded from their respective
- On Fedora: ``sudo dnf install haskell-platform git ghc-haskeline-devel``
+%web sites, as described below.
 === Stack ===
 The primary installation method is via //Stack//.
 (You can also use Cabal, but we recommend Stack to those who are new to Haskell.)
 To install Stack:
 - **On Linux and Mac OS**, do either
    ``$ curl -sSL https://get.haskellstack.org/ | sh``
  or
    ``$ wget -qO- https://get.haskellstack.org/ | sh``
-**On Mac OS and Windows**, the tools can be downloaded from their respective
+- **On other operating systems**, see the [installation guide https://docs.haskellstack.org/en/stable/install_and_upgrade].
 web sites, as described below.
 === The Haskell Platform ===
-GF is written in Haskell, so first of all you need
+%If you already have Stack installed, upgrade it to the latest version by running: ``stack upgrade``
 the //Haskell Platform//, e.g. version 8.0.2 or 7.10.3. Downloads
 and installation instructions are available from here:
    http://hackage.haskell.org/platform/
 Once you have installed the Haskell Platform, open a terminal
 (Command Prompt on Windows) and try to execute the following command:
 ```
 $ ghc --version
 ```
 This command should show you which version of GHC you have. If the installation
 of the Haskell Platform	 was successful you should see a message like:
 ```
 The Glorious Glasgow Haskell Compilation System, version 8.0.2
 ```
 Other required tools included in the Haskell Platform are
 [Cabal http://www.haskell.org/cabal/],
 [Alex http://www.haskell.org/alex/]
 and
 [Happy http://www.haskell.org/happy/].
 === Git ===
-To get the GF source code, you also need //Git//.
+To get the GF source code, you also need //Git//, a distributed version control system.
 //Git// is a distributed version control system, see
 https://git-scm.com/downloads for more information.
-=== The haskeline library ===
+- **On Linux**, the best option is to install the tools via the standard
 software distribution channels:
  - On Ubuntu: ``sudo apt-get install git-all``
  - On Fedora: ``sudo dnf install git-all``
 - **On other operating systems**, see
 https://git-scm.com/book/en/v2/Getting-Started-Installing-Git for installation.
 === Haskeline ===
 GF uses //haskeline// to enable command line editing in the GF shell.
 This should work automatically on Mac OS and Windows, but on Linux one
 extra step is needed to make sure the C libraries (terminfo)
 required by //haskeline// are installed.  Here is one way to do this:
- On Ubuntu: ``sudo apt-get install libghc-haskeline-dev``
+- **On Mac OS and Windows**, this should work automatically.
- On Fedora: ``sudo dnf install ghc-haskeline-devel``
+
 - **On Linux**, an extra step is needed to make sure the C libraries (terminfo)
 required by //haskeline// are installed:
  - On Ubuntu: ``sudo apt-get install libghc-haskeline-dev``
  - On Fedora: ``sudo dnf install ghc-haskeline-devel``
-== Getting the source ==
+== Getting the source ==[getting-source]
-Once you have all tools in place you can get the GF source code. If you
+Once you have all tools in place you can get the GF source code from
-just want to compile and use GF then it is enough to have read-only
+[GitHub https://github.com/GrammaticalFramework/]:
 access. It is also possible to make changes in the source code but if you
 want these changes to be applied back to the main source repository you will
 have to send the changes to us.  If you plan to work continuously on
 GF then you should consider getting read-write access.
-=== Read-only access ===
+- https://github.com/GrammaticalFramework/gf-core for the GF compiler
 - https://github.com/GrammaticalFramework/gf-rgl for the Resource Grammar Library
 ==== Getting a fresh copy for read-only access ====
-Anyone can get the latest development version of GF by running:
+=== Read-only access: clone the main repository ===
 If you only want to compile and use GF, you can just clone the repositories as follows:
 ```
-$ git clone https://github.com/GrammaticalFramework/gf-core.git
+  $ git clone https://github.com/GrammaticalFramework/gf-core.git
-$ git clone https://github.com/GrammaticalFramework/gf-rgl.git
+  $ git clone https://github.com/GrammaticalFramework/gf-rgl.git
 ```
-This will create directories ``gf-core`` and ``gf-rgl`` in the current directory.
+To get new updates, run the following anywhere in your local copy of the repository:
 ==== Updating your copy ====
 To get all new patches from each repo:
 ```
 $ git pull
 ```
 This can be done anywhere in your local repository.
 ==== Recording local changes ====[record]
 Since every copy is a repository, you can have local version control
 of your changes.
 If you have added files, you first need to tell your local repository to
 keep them under revision control:
 ```
-$ git add file1 file2 ...
+  $ git pull
 ```
-To record changes, use:
+=== Contribute your changes: fork the main repository ===
 If you want the possibility to contribute your changes,
 you should create your own fork, do your changes there,
 and then send a pull request to the main repository.
 + **Creating and cloning a fork  —**
 See GitHub documentation for instructions how to [create your own fork https://docs.github.com/en/get-started/quickstart/fork-a-repo]
 of the repository. Once you've done it, clone the fork to your local computer.
 ```
-$ git commit file1 file2 ...
+  $ git clone https://github.com/<YOUR_USERNAME>/gf-core.git
 ```
-This creates a patch against the previous version and stores it in your
+ **Updating your copy —**
-local repository. You can record any number of changes before
+Once you have cloned your fork, you need to set up the main repository as a remote:
 pushing them to the main repo. In fact, you don't have to push them at
 all if you want to keep the changes only in your local repo.
 Instead of enumerating all modified files on the command line,
 you can use the flag ``-a`` to automatically record //all// modified
 files. You still need to use ``git add`` to add new files.
 === Read-write access ===
 If you are a member of the GF project on GitHub, you can push your
 changes directly to the GF git repository on GitHub.
 ```
-$ git push
+  $ git remote add upstream https://github.com/GrammaticalFramework/gf-core.git
 ```
-It is also possible for anyone else to contribute by
+Then you can get the latest updates by running the following:
- creating a fork of the GF repository on GitHub,
+```
- working with local clone of the fork (obtained with ``git clone``),
+  $ git pull upstream master
- pushing changes to the fork,
+```
- and finally sending a pull request.
+
 + **Recording local changes —**
 See Git tutorial on how to [record and push your changes https://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository] to your fork.
 + **Pull request —**
 When you want to contribute your changes to the main gf-core repository,
 [create a pull request https://docs.github.com/en/github/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request]
 from your fork.
-== Compilation from source with Cabal ==
+If you want to contribute to the RGL as well, do the same process for the RGL repository.
-The build system of GF is based on //Cabal//, which is part of the
+
-Haskell Platform, so no extra steps are needed to install it. In the simplest
+== Compilation from source ==
-case, all you need to do to compile and install GF, after downloading the
+
-source code as described above, is
+By now you should have installed Stack and Haskeline, and cloned the Git repository on your own computer, in a directory called ``gf-core``.
 === Primary recommendation: use Stack ===
 Open a terminal, go to the top directory (``gf-core``), and type the following command.
 ```
 $ stack install
 ```
 It will install GF and all necessary tools and libraries to do that.
 === Alternative: use Cabal ===
 You can also install GF using Cabal, if you prefer Cabal to Stack. In that case, you may need to install some prerequisites yourself.
 The actual installation process is similar to Stack: open a terminal, go to the top directory (``gf-core``), and type the following command.
 ```
 $ cabal install
 ```
-This will automatically download any additional Haskell libraries needed to
+//The old (potentially outdated) instructions for Cabal are moved to a [separate page ../doc/gf-developers-old-cabal.html]. If you run into trouble with ``cabal install``, you may want to take a look.//
 build GF. If this is the first time you use Cabal, you might need to run
 ``cabal update`` first, to update the list of available libraries.
-If you want more control, the process can also be split up into the usual
+== Compiling GF with C runtime system support ==
 //configure//, //build// and //install// steps.
-=== Configure ===
+The C runtime system is a separate implementation of the PGF runtime services.
 During the configuration phase Cabal will check that you have all
 necessary tools and libraries needed for GF. The configuration is
 started by the command:
 ```
 $ cabal configure
 ```
 If you don't see any error message from the above command then you
 have everything that is needed for GF. You can also add the option
 ``-v`` to see more details about the configuration.
 You can use ``cabal configure --help`` to get a list of configuration options.
 === Build ===
 The build phase does two things. First it builds the GF compiler from
 the Haskell source code and after that it builds the GF Resource Grammar
 Library using the already build compiler.  The simplest command is:
 ```
 $ cabal build
 ```
 Again you can add the option ``-v`` if you want to see more details.
 ==== Parallel builds ====
 If you have Cabal>=1.20 you can enable parallel compilation by using
 ```
 $ cabal build -j
 ```
 or by putting a line
 ```
 jobs: $ncpus
 ```
 in your ``.cabal/config`` file. Cabal
 will pass this option to GHC when building the GF compiler, if you
 have GHC>=7.8.
 Cabal also passes ``-j`` to GF to enable parallel compilation of the
 Resource Grammar Library. This is done unconditionally to avoid
 causing problems for developers with Cabal<1.20. You can disable this
 by editing the last few lines in ``WebSetup.hs``.
 ==== Partial builds ====
 **NOTE**: The following doesn't work with recent versions of ``cabal``.
 %% // TH 2015-06-22
 Sometimes you just want to work on the GF compiler and don't want to
 recompile the resource library after each change. In this case use
 this extended command:
 ```
 $ cabal build rgl-none
 ```
 The resource library could also be compiled in two modes: with present
 tense only and with all tenses. By default it is compiled with all
 tenses. If you want to use the library with only present tense you can
 compile it in this special mode with the command:
 ```
 $ cabal build present
 ```
 You could also control which languages you want to be recompiled by
 adding the option ``langs=list``. For example the following command
 will compile only the English and the Swedish language:
 ```
 $ cabal build langs=Eng,Swe
 ```
 === Install ===
 After you have compiled GF you need to install the executable and libraries
 to make the system usable.
 ```
 $ cabal copy
 $ cabal register
 ```
 This command installs the GF compiler for a single user, in the standard
 place used by Cabal.
 On Linux and Mac this could be ``$HOME/.cabal/bin``.
 On Mac it could also be ``$HOME/Library/Haskell/bin``.
 On Windows this is ``C:\Program Files\Haskell\bin``.
 The compiled GF Resource Grammar Library will be installed
 under the same prefix, e.g. in
 ``$HOME/.cabal/share/gf-3.3.3/lib`` on Linux and
 in ``C:\Program Files\Haskell\gf-3.3.3\lib`` on Windows.
 If you want to install in some other place then use the ``--prefix``
 option during the configuration phase.
 === Clean ===
 Sometimes you want to clean up the compilation and start again from clean
 sources. Use the clean command for this purpose:
 ```
 $ cabal clean
 ```
 %=== SDist ===
 %
 %You can use the command:
 %
 %% This does *NOT* include everything that is needed // TH 2012-08-06
 %```
 %$ cabal sdist
 %```
 %
 %to prepare archive with all source codes needed to compile GF.
 === Known problems with Cabal ===
 Some versions of Cabal (at least version 1.16) seem to have a bug that can
 cause the following error:
 ```
 Configuring gf-3.x...
 setup: Distribution/Simple/PackageIndex.hs:124:8-13: Assertion failed
 ```
 The exact cause of this problem is unclear, but it seems to happen
 during the configure phase if the same version of GF is already installed,
 so a workaround is to remove the existing installation with
 ```
 ghc-pkg unregister gf
 ```
 You can check with ``ghc-pkg list gf`` that it is gone.
 == Compilation with make ==
 If you feel more comfortable with Makefiles then there is a thin Makefile
 wrapper arround Cabal for you. If you just type:
 ```
 $ make
 ```
 the configuration phase will be run automatically if needed and after that
 the sources will be compiled.
 %% cabal build rgl-none does not work with recent versions of Cabal
 %If you don't want to compile the resource library
 %every time then you can use:
 %```
 %$ make gf
 %```
 For installation use:
 ```
 $ make install
 ```
 For cleaning:
 ```
 $ make clean
 ```
 %and to build source distribution archive run:
 %```
 %$ make sdist
 %```
 == Compiling GF with C run-time system support ==
 The C run-time system is a separate implementation of the PGF run-time services.
 It makes it possible to work with very large, ambiguous grammars, using
-probabilistic models to obtain probable parses. The C run-time system might
+probabilistic models to obtain probable parses. The C runtime system might
-also be easier to use than the Haskell run-time system on certain platforms,
+also be easier to use than the Haskell runtime system on certain platforms,
 e.g. Android and iOS.
-To install the C run-time system, go to the ``src/runtime/c`` directory
+To install the C runtime system, go to the ``src/runtime/c`` directory.
 %and follow the instructions in the ``INSTALL`` file.
 and use the ``install.sh`` script:
 ```
 bash setup.sh configure
 bash setup.sh build
 bash setup.sh install
 ```
 This will install
 the C header files and libraries need to write C programs that use PGF grammars.
 Some example C programs are included in the ``utils`` subdirectory, e.g.
 ``pgf-translate.c``.
-When the C run-time system is installed, you can install GF with C run-time
+- **On Linux and Mac OS —**
-support by doing
+  You should have autoconf, automake, libtool and make.
  If you are missing some of them, follow the
  instructions in the [INSTALL https://github.com/GrammaticalFramework/gf-core/blob/master/src/runtime/c/INSTALL] file.
  Once you have the required libraries, the easiest way to install the C runtime is to use the ``install.sh`` script. Just type
  ``$ bash install.sh``
  This will install the C header files and libraries need to write C programs
  that use PGF grammars.
 %  If this doesn't work for you, follow the manual instructions in the [INSTALL https://github.com/GrammaticalFramework/gf-core/blob/master/src/runtime/c/INSTALL] file under your operating system.
 - **On other operating systems —** Follow the instructions in the
 [INSTALL https://github.com/GrammaticalFramework/gf-core/blob/master/src/runtime/c/INSTALL] file under your operating system.
 Depending on what you want to do with the C runtime, you can follow one or more of the following steps.
 === Use the C runtime from another programming language ===[bindings]
 % **If you just want to use the C runtime from Python, Java, or Haskell, you don't need to change your GF installation.**
 - **What —**
 This is the most common use case for the C runtime: compile
 your GF grammars into PGF with the standard GF executable,
 and manipulate the PGFs from another programming language,
 using the bindings to the C runtime.
 - **How —**
 The Python, Java and Haskell bindings are found in the
 ``src/runtime/{python,java,haskell-bind}`` directories,
 respecively. Compile them by following the instructions
 in the ``INSTALL`` or ``README`` files in those directories.
 The Python library can also be installed from PyPI using ``pip install pgf``.
 //If you are on Mac and get an error about ``clang`` version, you can try some of [these solutions https://stackoverflow.com/questions/63972113/big-sur-clang-invalid-version-error-due-to-macosx-deployment-target]—but be careful before removing any existing installations.//
 === Use GF shell with C runtime support ===
 - **What —**
 If you want to use the GF shell with C runtime functionalities, then you need to (re)compile GF with special flags.
 The GF shell can be started with ``gf -cshell`` or ``gf -crun`` to use
 the C run-time system instead of the Haskell run-time system.
 Only limited functionality is available when running the shell in these
 modes (use the ``help`` command in the shell for details).
 (Re)compiling your GF with these flags will also give you
 Haskell bindings to the C runtime, as a library called ``PGF2``,
 but if you want Python or Java bindings, you need to do [the previous step #bindings].
 % ``PGF2``: a module to import in Haskell programs, providing a binding to the C run-time system.
 - **How —**
 If you use cabal, run the following command:
 ```
-cabal install -fserver -fc-runtime
+cabal install -fc-runtime
 ```
 from the top directory. This give you three new things:
- ``PGF2``: a module to import in Haskell programs, providing a binding to
+from the top directory (``gf-core``).
   the C run-time system.
- The GF shell can be started with ``gf -cshell`` or ``gf -crun`` to use
+If you use stack, uncomment the following lines in the ``stack.yaml`` file:
  the C run-time system instead of the Haskell run-time system.
  Only limited functionality is available when running the shell in these
  modes (use the ``help`` command in the shell for details).
- ``gf -server`` mode is extended with new requests to call the C run-time
+```
-   system, e.g. ``c-parse``, ``c-linearize`` and ``c-translate``.
+flags:
   gf:
     c-runtime: true
 extra-lib-dirs:
   - /usr/local/lib
 ```
 and then run ``stack install`` from the top directory (``gf-core``).
-=== Python and Java bindings ===
+//If you get an "``error while loading shared libraries``" when trying to run GF with C runtime, remember to declare your ``LD_LIBRARY_PATH``.//
 //Add ``export LD_LIBRARY_PATH="/usr/local/lib"`` to either your ``.bashrc`` or ``.profile``. You should now be able to start GF with C runtime.//
 === Use GF server mode with C runtime ===
 - **What —**
 With this feature, ``gf -server`` mode is extended with new requests to call the C run-time
 system, e.g. ``c-parse``, ``c-linearize`` and ``c-translate``.
 - **How —**
 If you use cabal, run the following command:
 ```
 cabal install -fc-runtime -fserver
 ```
 from the top directory.
 If you use stack, add the following lines in the ``stack.yaml`` file:
 ```
 flags:
   gf:
     c-runtime: true
     server: true
 extra-lib-dirs:
   - /usr/local/lib
 ```
 and then run ``stack install``, also from the top directory.
 The C run-time system can also be used from Python and Java. Python and Java
 bindings are found in the ``src/runtime/python`` and ``src/runtime/java``
 directories, respecively. Compile them by following the instructions in
 the ``INSTALL`` files in those directories.
 The Python library can also be installed from PyPI using `pip install pgf`.
 == Compilation of RGL ==
 As of 2018-07-26, the RGL is distributed separately from the GF compiler and runtimes.
 To get the source, follow the previous instructions on [how to clone a repository with Git #getting-source].
 After cloning the RGL, you should have a directory named ``gf-rgl`` on your computer.
 === Simple ===
 To install the RGL, you can use the following commands from within the ``gf-rgl`` repository:
 ```
@@ -418,103 +317,68 @@ If you do not have Haskell installed, you can use the simple build script ``Setu
 == Creating binary distribution packages ==
-=== Creating .deb packages for Ubuntu ===
+The binaries are generated with Github Actions. More details can be viewed here:
-This was tested on Ubuntu 14.04 for the release of GF 3.6, and the
+https://github.com/GrammaticalFramework/gf-core/actions/workflows/build-binary-packages.yml
 resulting ``.deb`` packages appears to work on Ubuntu 12.04, 13.10 and 14.04.
 For the release of GF 3.7, we generated ``.deb`` packages on Ubuntu 15.04 and
 tested them on Ubuntu 12.04 and 14.04.
 Under Ubuntu, Haskell executables are statically linked against other Haskell
 libraries, so the .deb packages are fairly self-contained.
-==== Preparations ====
+== Running the test suite ==
 The GF test suite is run with one of the following commands from the top directory:
 ```
-sudo apt-get install dpkg-dev debhelper
+  $ cabal test
 ```
-==== Creating the package ====
+or
 Make sure the ``debian/changelog`` starts with an entry that describes the
 version you are building. Then run
 ```
-make deb
+  $ stack test
 ```
 If get error messages about missing dependencies
 (e.g. ``autoconf``, ``automake``, ``libtool-bin``, ``python-dev``,
 ``java-sdk``, ``txt2tags``)
 use ``apt-get intall`` to install them, then try again.
 === Creating OS X Installer packages ===
 Run
 ```
 make pkg
 ```
 === Creating binary tar distributions ===
 Run
 ```
 make bintar
 ```
 === Creating .rpm packages for Fedora ===
 This is possible, but the procedure has not been automated.
 It involves using the cabal-rpm tool,
 ```
 sudo dnf install cabal-rpm
 ```
 and following the Fedora guide
 [How to create an RPM package http://fedoraproject.org/wiki/How_to_create_an_RPM_package].
 Under Fedora, Haskell executables are dynamically linked against other Haskell
 libraries, so ``.rpm`` packages for all Haskell libraries that GF depends on
 are required. Most of them are already available in the Fedora distribution,
 but a few of them might have to be built and distributed along with
 the GF ``.rpm`` package.
 When building ``.rpm`` packages for GF 3.4, we also had to build ``.rpm``s for
 ``fst`` and ``httpd-shed``.
 == Running the testsuite ==
 **NOTE:** The test suite has not been maintained recently, so expect many
 tests to fail.
 %% // TH 2012-08-06
 GF has testsuite. It is run with the following command:
 ```
 $ cabal test
 ```
 The testsuite architecture for GF is very simple but still very flexible.
 GF by itself is an interpreter and could execute commands in batch mode.
 This is everything that we need to organize a testsuite. The root of the
-testsuite is the testsuite/ directory. It contains subdirectories which
+testsuite is the ``testsuite/`` directory. It contains subdirectories
-themself contain GF batch files (with extension .gfs). The above command
+which themselves contain GF batch files (with extension ``.gfs``).
-searches the subdirectories of the testsuite/ directory for files with extension
+The above command searches the subdirectories of the ``testsuite/`` directory
-.gfs and when it finds one it is executed with the GF interpreter.
+for files with extension ``.gfs`` and when it finds one, it is executed with
-The output of the script is stored in file with extension .out and is compared
+the GF interpreter. The output of the script is stored in file with extension ``.out``
-with the content of the corresponding file with extension .gold, if there is one.
+and is compared with the content of the corresponding file with extension ``.gold``, if there is one.
 If the contents are identical the command reports that the test was passed successfully.
 Otherwise the test had failed.
-Every time when you make some changes to GF that have to be tested, instead of
+Every time when you make some changes to GF that have to be tested,
-writing the commands by hand in the GF shell, add them to one .gfs file in the testsuite
+instead of writing the commands by hand in the GF shell, add them to one ``.gfs``
-and run the test. In this way you can use the same test later and we will be sure
+file in the testsuite subdirectory where its ``.gf`` file resides and run the test.
-that we will not incidentaly break your code later.
+In this way you can use the same test later and we will be sure that we will not
 accidentally break your code later.
 **Test Outcome - Passed:** If the contents of the files with the ``.out`` extension
 are identical to their correspondingly-named files with the extension ``.gold``,
 the command will report that the tests passed successfully, e.g.
 If you don't want to run the whole testsuite you can write the path to the subdirectory
 in which you are interested. For example:
 ```
-$ cabal test testsuite/compiler
+ Running 1 test suites...
 Test suite gf-tests: RUNNING...
 Test suite gf-tests: PASS
 1 of 1 test suites (1 of 1 test cases) passed.
 ```
-will run only the testsuite for the compiler.
+
 **Test Outcome - Failed:**  If there is a contents mismatch between the files
 with the ``.out`` extension and their corresponding files with the extension ``.gold``,
 the test diagnostics will show a fail and the areas that failed. e.g.
 ```
  testsuite/compiler/compute/Records.gfs: OK
  testsuite/compiler/compute/Variants.gfs: FAIL
  testsuite/compiler/params/params.gfs: OK
  Test suite gf-tests: FAIL
  0 of 1 test suites (0 of 1 test cases) passed.
 ```
 The fail results overview is available in gf-tests.html which shows 4 columns:
 + __Results__ - only areas that fail will appear. (Note: There are 3 failures in the gf-tests.html which are labelled as (expected). These failures should be ignored.)
 + __Input__ - which is the test written in the .gfs file
 + __Gold__ - the expected output from running the test set out in the .gfs file. This column refers to the contents from the .gold extension files.
 + __Output__ - This column refers to the contents from the .out extension files which are generated as test output.
 After fixing the areas which fail, rerun the test command. Repeat the entire process of fix-and-test until the test suite passes before  submitting a pull request to include your changes.
--- a/download/index-3.11.md
+++ b/download/index-3.11.md
@@ -1,8 +1,9 @@
 ---
 title: Grammatical Framework Download and Installation
-...
+date: 25 July 2021
 ---
-**GF 3.11** was released on ... December 2020.
+**GF 3.11** was released on 25 July 2021.
 What's new? See the [release notes](release-3.11.html).
@@ -24,22 +25,25 @@ Binary packages are available for Debian/Ubuntu, macOS, and Windows and include:
 Unlike in previous versions, the binaries **do not** include the RGL.
-[Binary packages on GitHub](https://github.com/GrammaticalFramework/gf-core/releases/tag/RELEASE-3.11)
+[Binary packages on GitHub](https://github.com/GrammaticalFramework/gf-core/releases/tag/3.11)
 #### Debian/Ubuntu
 There are two versions: `gf-3.11-ubuntu-18.04.deb` for Ubuntu 18.04 (Cosmic), and `gf-3.11-ubuntu-20.04.deb` for Ubuntu 20.04 (Focal).
 To install the package use:
 ```
-sudo dpkg -i gf_3.11.deb
+sudo apt-get install ./gf-3.11-ubuntu-*.deb
 ```
-The Ubuntu `.deb` packages should work on Ubuntu 16.04, 18.04 and similar Linux distributions.
+<!-- The Ubuntu `.deb` packages should work on Ubuntu 16.04, 18.04 and similar Linux distributions. -->
 #### macOS
 To install the package, just double-click it and follow the installer instructions.
-The packages should work on at least 10.13 (High Sierra) and 10.14 (Mojave).
+The packages should work on at least Catalina and Big Sur.
 #### Windows
@@ -49,7 +53,7 @@ You will probably need to update the `PATH` environment variable to include your
 For more information, see [Using GF on Windows](https://www.grammaticalframework.org/~inari/gf-windows.html) (latest updated for Windows 10).
-## Installing the latest Hackage release (macOS, Linux, and WSL2 on Windows)
+<!--## Installing the latest Hackage release (macOS, Linux, and WSL2 on Windows)
 [GF is on Hackage](http://hackage.haskell.org/package/gf), so under
 normal circumstances the procedure is fairly simple:
@@ -89,7 +93,7 @@ Here is one way to do this:
 **GHC version**
 The GF source code has been updated to compile with GHC versions 7.10 through to 8.8.
-
+-->
 ## Installing from the latest developer source code
 If you haven't already, clone the repository with:
@@ -116,7 +120,7 @@ or, if you're a Stack user:
 stack install
 ```
-The above notes for installing from source apply also in these cases.
+<!--The above notes for installing from source apply also in these cases.-->
 For more info on working with the GF source code, see the
 [GF Developers Guide](../doc/gf-developers.html).
--- a/download/index.html
+++ b/download/index.html
@@ -1,8 +1,8 @@
 <html>
 <head>
-  <meta http-equiv="refresh" content="0; URL=/download/index-3.10.html" />
+  <meta http-equiv="refresh" content="0; URL=/download/index-3.11.html" />
 </head>
 <body>
-  You are being redirected to <a href="index-3.10.html">the current version</a> of this page.
+  You are being redirected to <a href="index-3.11.html">the current version</a> of this page.
 </body>
 </html>
--- a/download/release-3.11.md
+++ b/download/release-3.11.md
@@ -1,7 +1,7 @@
 ---
 title: GF 3.11 Release Notes
-date: ... December 2020
+date: 25 July 2021
-...
+---
 ## Installation
@@ -12,24 +12,27 @@ See the [download page](index-3.11.html).
 From this release, the binary GF core packages do not contain the RGL.
 The RGL's release cycle is now completely separate from GF's. See [RGL releases](https://github.com/GrammaticalFramework/gf-rgl/releases).
-Over 400 changes have been pushed to GF core
+Over 500 changes have been pushed to GF core
 since the release of GF 3.10 in December 2018.
 ## General
 - Make the test suite work again.
 - Compatibility with new versions of GHC, including multiple Stack files for the different versions.
- Updates to build scripts and CI.
+- Support for newer version of Ubuntu 20.04 in the precompiled binaries.
- Bug fixes.
+- Updates to build scripts and CI workflows.
 - Bug fixes and code cleanup.
 ## GF compiler and run-time library
 - Huge improvements in time & space requirements for grammar compilation (pending [#87](https://github.com/GrammaticalFramework/gf-core/pull/87)).
 - Add CoNLL output to `visualize_tree` shell command.
 - Add canonical GF as output format in the compiler.
 - Add PGF JSON as output format in the compiler.
 - Deprecate JavaScript runtime in favour of updated [TypeScript runtime](https://github.com/GrammaticalFramework/gf-typescript).
 - Improvements in time & space requirements when compiling certain grammars.
 - Improvements to Haskell export.
 - Improvements to the GF shell.
 - Improvements to canonical GF compilation.
 - Improvements to the C runtime.
 - Improvements to `gf -server` mode.
 - Clearer compiler error messages.
--- a/gf.cabal
+++ b/gf.cabal
@@ -1,17 +1,16 @@
 name: gf
-version: 3.10.4-git
+version: 3.11.0-git
-cabal-version: >= 1.22
+cabal-version: 1.22
 build-type: Custom
 license: OtherLicense
 license-file: LICENSE
 category: Natural Language Processing, Compiler
 synopsis: Grammatical Framework
 description: GF, Grammatical Framework, is a programming language for multilingual grammar applications
-homepage: http://www.grammaticalframework.org/
+homepage: https://www.grammaticalframework.org/
 bug-reports: https://github.com/GrammaticalFramework/gf-core/issues
-maintainer: Thomas Hallgren
+tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.10.4
 tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.2.2, GHC==8.4.3
 data-dir: src
 extra-source-files: WebSetup.hs
@@ -42,23 +41,23 @@ data-files:
 custom-setup
  setup-depends:
-    base,
+    base >= 4.9.1 && < 4.15,
-    Cabal >=1.22.0.0,
+    Cabal >= 1.22.0.0,
-    directory,
+    directory >= 1.3.0 && < 1.4,
-    filepath,
+    filepath >= 1.4.1 && < 1.5,
-    process >=1.0.1.1
+    process >= 1.0.1.1 && < 1.7
 source-repository head
-  type:     git
+  type: git
  location: https://github.com/GrammaticalFramework/gf-core.git
 flag interrupt
  Description: Enable Ctrl+Break in the shell
-  Default:     True
+  Default: True
 flag server
  Description: Include --server mode
-  Default:     True
+  Default: True
 flag network-uri
   description: Get Network.URI from the network-uri package
@@ -70,24 +69,29 @@ flag network-uri
 flag c-runtime
  Description: Include functionality from the C run-time library (which must be installed already)
-  Default:     False
+  Default: False
 library
-  default-language:    Haskell2010
+  default-language: Haskell2010
-  build-depends: base >= 4.6 && <5,
+  build-depends:
-                 array,
+    -- GHC 8.0.2 to GHC 8.10.4
-                 containers,
+    array >= 0.5.1 && < 0.6,
-                 bytestring,
+    base >= 4.9.1 && < 4.15,
-                 utf8-string,
+    bytestring >= 0.10.8 && < 0.11,
-                 random,
+    containers >= 0.5.7 && < 0.7,
-                 pretty,
+    exceptions >= 0.8.3 && < 0.11,
-                 mtl,
+    ghc-prim >= 0.5.0 && < 0.7,
-                 exceptions,
+    mtl >= 2.2.1 && < 2.3,
-                 fail,
+    pretty >= 1.1.3 && < 1.2,
-                 -- For compatability with ghc < 8
+    random >= 1.1 && < 1.3,
-                 -- We need transformers-compat >= 0.6.3, but that is only in newer snapshots where it is redundant.
+    utf8-string >= 1.0.1.1 && < 1.1,
-                 transformers-compat,
+    -- We need transformers-compat >= 0.6.3, but that is only in newer snapshots where it is redundant.
-                 ghc-prim
+    transformers-compat >= 0.5.1.4 && < 0.7
  if impl(ghc<8.0)
    build-depends:
      fail >= 4.9.0 && < 4.10
  hs-source-dirs: src/runtime/haskell
  other-modules:
@@ -136,18 +140,28 @@ library
  if flag(c-runtime)
    exposed-modules: PGF2
-    other-modules:   PGF2.FFI PGF2.Expr PGF2.Type
+    other-modules:
-                     GF.Interactive2 GF.Command.Commands2
+      PGF2.FFI
-    hs-source-dirs:  src/runtime/haskell-bind
+      PGF2.Expr
-    build-tools:     hsc2hs
+      PGF2.Type
      GF.Interactive2
      GF.Command.Commands2
    hs-source-dirs: src/runtime/haskell-bind
    build-tools: hsc2hs
    extra-libraries: pgf gu
-    c-sources:       src/runtime/haskell-bind/utils.c
+    c-sources: src/runtime/haskell-bind/utils.c
-    cc-options:      -std=c99
+    cc-options: -std=c99
 ---- GF compiler as a library:
-  build-depends: filepath, directory>=1.2, time,
+  build-depends:
-                 process, haskeline, parallel>=3, json
+    directory >= 1.3.0 && < 1.4,
    filepath >= 1.4.1 && < 1.5,
    haskeline >= 0.7.3 && < 0.9,
    json >= 0.9.1 && < 0.11,
    parallel >= 3.2.1.1 && < 3.3,
    process >= 1.4.3 && < 1.7,
    time >= 1.6.0 && < 1.10
  hs-source-dirs: src/compiler
  exposed-modules:
@@ -158,12 +172,19 @@ library
    GF.Grammar.Canonical
  other-modules:
-    GF.Main GF.Compiler GF.Interactive
+    GF.Main
    GF.Compiler
    GF.Interactive
-    GF.Compile GF.CompileInParallel GF.CompileOne  GF.Compile.GetGrammar
+    GF.Compile
    GF.CompileInParallel
    GF.CompileOne
    GF.Compile.GetGrammar
    GF.Grammar
-    GF.Data.Operations GF.Infra.Option GF.Infra.UseIO
+    GF.Data.Operations
    GF.Infra.Option
    GF.Infra.UseIO
    GF.Command.Abstract
    GF.Command.CommandInfo
@@ -273,12 +294,17 @@ library
    cpp-options: -DC_RUNTIME
  if flag(server)
-    build-depends: httpd-shed>=0.4.0.3, network>=2.3 && <2.7,
+    build-depends:
-                   cgi>=3001.2.2.0
+      cgi >= 3001.3.0.2 && < 3001.6,
      httpd-shed >= 0.4.0 && < 0.5,
      network>=2.3 && <2.7
    if flag(network-uri)
-      build-depends: network-uri>=2.6, network>=2.6
+      build-depends:
        network-uri >= 2.6.1.0 && < 2.7,
        network>=2.6 && <2.7
    else
-      build-depends: network<2.6
+      build-depends:
        network >= 2.5 && <2.6
    cpp-options: -DSERVER_MODE
    other-modules:
@@ -295,7 +321,10 @@ library
      Fold
      ExampleDemo
      ExampleService
-    hs-source-dirs: src/server src/server/transfer src/example-based
+    hs-source-dirs:
      src/server
      src/server/transfer
      src/example-based
  if flag(interrupt)
    cpp-options: -DUSE_INTERRUPT
@@ -304,17 +333,24 @@ library
    other-modules: GF.System.NoSignal
  if impl(ghc>=7.8)
-    build-tools: happy>=1.19, alex>=3.1
+    build-tools:
      happy>=1.19,
      alex>=3.1
 --  ghc-options: +RTS -A20M -RTS
  else
-    build-tools: happy, alex>=3
+    build-tools:
      happy,
      alex>=3
  ghc-options: -fno-warn-tabs
  if os(windows)
-    build-depends: Win32
+    build-depends:
      Win32 >= 2.3.1.1 && < 2.7
  else
-    build-depends: unix, terminfo>=0.4
+    build-depends:
      terminfo >=0.4.0 && < 0.5,
      unix >= 2.7.2 && < 2.8
  if impl(ghc>=8.2)
    ghc-options: -fhide-source-paths
@@ -322,8 +358,10 @@ library
 executable gf
  hs-source-dirs: src/programs
  main-is: gf-main.hs
-  default-language:    Haskell2010
+  default-language: Haskell2010
-  build-depends: gf, base
+  build-depends:
    gf,
    base
  ghc-options: -threaded
 --ghc-options: -fwarn-unused-imports
@@ -337,20 +375,30 @@ executable gf
  if impl(ghc>=8.2)
    ghc-options: -fhide-source-paths
-executable pgf-shell
+-- executable pgf-shell
--if !flag(c-runtime)
+-- --if !flag(c-runtime)
-  buildable: False
+--   buildable: False
-  main-is:             pgf-shell.hs
+--   main-is: pgf-shell.hs
-  hs-source-dirs:      src/runtime/haskell-bind/examples
+--   hs-source-dirs: src/runtime/haskell-bind/examples
-  build-depends:       gf, base, containers, mtl, lifted-base
+--   build-depends:
-  default-language:    Haskell2010
+--     gf,
-  if impl(ghc>=7.0)
+--     base,
-    ghc-options: -rtsopts
+--     containers,
 --     mtl,
 --     lifted-base
 --   default-language: Haskell2010
 --   if impl(ghc>=7.0)
 --     ghc-options: -rtsopts
 test-suite gf-tests
-  type:           exitcode-stdio-1.0
+  type: exitcode-stdio-1.0
-  main-is:        run.hs
+  main-is: run.hs
  hs-source-dirs: testsuite
-  build-depends:  base>=4.3 && <5, Cabal>=1.8, directory, filepath, process
+  build-depends:
    base >= 4.9.1 && < 4.15,
    Cabal >= 1.8,
    directory >= 1.3.0 && < 1.4,
    filepath >= 1.4.1 && < 1.5,
    process >= 1.4.3 && < 1.7
  build-tool-depends: gf:gf
-  default-language:    Haskell2010
+  default-language: Haskell2010
--- a/index.html
+++ b/index.html
@@ -214,9 +214,9 @@ least one, it may help you to get a first idea of what GF is.
    </p>
    <p>
-    We run the IRC channel <strong><code>#gf</code></strong> on the Freenode network, where you are welcome to look for help with small questions or just start a general discussion.
+    We run the IRC channel <strong><code>#gf</code></strong> on the Libera network, where you are welcome to look for help with small questions or just start a general discussion.
-    You can <a href="https://webchat.freenode.net/?channels=gf">open a web chat</a>
+    You can <a href="https://web.libera.chat/?channels=#gf">open a web chat</a>
-    or <a href="/irc/">browse the channel logs</a>.
+    or <a href="https://www.grammaticalframework.org/irc/?C=M;O=D">browse the channel logs</a>.
    </p>
    <p>
    If you have a larger question which the community may benefit from, we recommend you ask it on the <a href="http://groups.google.com/group/gf-dev">mailing list</a>.
@@ -226,7 +226,11 @@ least one, it may help you to get a first idea of what GF is.
  <div class="col-md-6">
    <h2>News</h2>
-
+    <dt class="col-sm-3 text-center text-nowrap">2021-07-25</dt>
    <dd class="col-sm-9">
      <strong>GF 3.11 released.</strong>
      <a href="download/release-3.11.html">Release notes</a>
    </dd>
    <dl class="row">
      <dt class="col-sm-3 text-center text-nowrap">2021-05-05</dt>
      <dd class="col-sm-9">
@@ -234,7 +238,7 @@ least one, it may help you to get a first idea of what GF is.
      </dd>
      <dt class="col-sm-3 text-center text-nowrap">2021-03-01</dt>
      <dd class="col-sm-9">
-        <a href="//school.grammaticalframework.org/2020/">Seventh GF Summer School</a>, in Singapore and online, 26 July &ndash; 8 August 2021.
+        <a href="//school.grammaticalframework.org/2020/">Seventh GF Summer School</a>, in Singapore and online, 26 July &ndash; 6 August 2021.
      </dd>
      <dt class="col-sm-3 text-center text-nowrap">2020-09-29</dt>
      <dd class="col-sm-9">
--- a/src/compiler/GF/Compile/CFGtoPGF.hs
+++ b/src/compiler/GF/Compile/CFGtoPGF.hs
@@ -130,5 +130,5 @@ cf2concr cfg = Concr Map.empty Map.empty
 mkRuleName rule =
  case ruleName rule of
-	CFObj n _ -> n
+    CFObj n _ -> n
-	_         -> wildCId
+    _         -> wildCId
--- a/src/compiler/GF/Compile/CheckGrammar.hs
+++ b/src/compiler/GF/Compile/CheckGrammar.hs
@@ -175,7 +175,7 @@ checkInfo opts cwd sgr (m,mo) c info = checkInModule cwd mo NoLoc empty $ do
        checkTyp gr typ
      case md of
        Just eqs -> mapM_ (\(L loc eq) -> mkCheck loc "the definition of function" $
-	                                        checkDef gr (m,c) typ eq) eqs
+                                          checkDef gr (m,c) typ eq) eqs
        Nothing  -> return ()
      return (AbsFun (Just (L loc typ)) ma md moper)
@@ -316,7 +316,7 @@ linTypeOfType cnc m typ = do
   mkLinArg (i,(n,mc@(m,cat))) = do
     val  <- lookLin mc
     let vars = mkRecType varLabel $ replicate n typeStr
-	 symb = argIdent n cat i
+         symb = argIdent n cat i
     rec <- if n==0 then return val else
                       errIn (render ("extending" $$
                                      nest 2 vars $$
--- a/src/compiler/GF/Compile/Compute/Concrete.hs
+++ b/src/compiler/GF/Compile/Compute/Concrete.hs
@@ -30,11 +30,12 @@ import Debug.Trace(trace)
 normalForm :: GlobalEnv -> L Ident -> Term -> Term
 normalForm (GE gr rv opts _) loc = err (bugloc loc) id . nfx (GE gr rv opts loc)
 nfx :: GlobalEnv -> Term -> Err Term
 nfx env@(GE _ _ _ loc) t = do
  v <- eval env [] t
-  case value2term loc [] v of
+  return (value2term loc [] v)
-    Left i  -> fail ("variable #"++show i++" is out of scope")
+    -- Old value2term error message:
-    Right t -> return t
+    -- Left i  -> fail ("variable #"++show i++" is out of scope")
 eval :: GlobalEnv -> Env -> Term -> Err Value
 eval (GE gr rvs opts loc) env t = ($ (map snd env)) # value cenv t
@@ -288,9 +289,9 @@ glue env (v1,v2) = glu v1 v2
          (v1,v2) -> if flag optPlusAsBind (opts env)
                       then VC v1 (VC (VApp BIND []) v2)
                       else let loc  = gloc env
-                                vt v = case value2term loc (local env) v of
+                                vt v = value2term loc (local env) v
-                                         Left i  -> Error ('#':show i)
+                                        -- Old value2term error message:
-                                         Right t -> t
+                                        --  Left i  -> Error ('#':show i)
                                originalMsg = render $ ppL loc (hang "unsupported token gluing" 4
                                                               (Glue (vt v1) (vt v2)))
                                term = render $ pp  $ Glue (vt v1) (vt v2)
@@ -355,9 +356,9 @@ select env vv =
      (v1,v2) -> ok2 VS v1 v2
 match loc cs v =
-  case value2term loc [] v of
+  err bad return (matchPattern cs (value2term loc [] v))
-    Left i  -> bad ("variable #"++show i++" is out of scope")
+    -- Old value2term error message:
-    Right t -> err bad return (matchPattern cs t)
+    -- Left i  -> bad ("variable #"++show i++" is out of scope")
  where
    bad = fail . ("In pattern matching: "++)
@@ -383,9 +384,8 @@ valueTable env i cs =
    wild = case i of TWild _ -> True; _ -> False
    convertv cs' vty =
-      case value2term (gloc env) [] vty of
+      convert' cs' =<< paramValues'' env (value2term (gloc env) [] vty)
-        Left i    -> fail ("variable #"++show i++" is out of scope")
+        -- Old value2term error message: Left i    -> fail ("variable #"++show i++" is out of scope")
        Right pty -> convert' cs' =<< paramValues'' env pty
    convert cs' ty = convert' cs' =<< paramValues' env ty
@@ -492,58 +492,60 @@ vtrace loc arg res = trace (render (hang (pv arg) 4 ("->"<+>pv res))) res
    pf (_,VString n) = pp n
    pf (_,v) = ppV v
    pa (_,v) = ppV v
-    ppV v = case value2term' True loc [] v of
+    ppV v = ppTerm Unqualified 10 (value2term' True loc [] v)
-              Left i  -> "variable #" <> pp i <+> "is out of scope"
+              -- Old value2term error message:
-              Right t -> ppTerm Unqualified 10 t
+              -- Left i  -> "variable #" <> pp i <+> "is out of scope"
 -- | Convert a value back to a term
-value2term :: GLocation -> [Ident] -> Value -> Either Int Term
+value2term :: GLocation -> [Ident] -> Value -> Term
 value2term = value2term' False
 value2term' :: Bool -> p -> [Ident] -> Value -> Term
 value2term' stop loc xs v0 =
  case v0 of
-    VApp pre vs    -> liftM (foldl App (Q (cPredef,predefName pre))) (mapM v2t vs)
+    VApp pre vs    -> applyMany (Q (cPredef,predefName pre)) vs
-    VCApp f vs     -> liftM  (foldl App (QC f))   (mapM v2t vs)
+    VCApp f vs     -> applyMany (QC f)                       vs
-    VGen j vs      -> liftM2 (foldl App) (var j)  (mapM v2t vs)
+    VGen j vs      -> applyMany (var j)                      vs
-    VMeta j env vs -> liftM  (foldl App (Meta j)) (mapM v2t vs)
+    VMeta j env vs -> applyMany (Meta j)                     vs
-    VProd bt v x f -> liftM2 (Prod bt x) (v2t v) (v2t' x f)
+    VProd bt v x f -> Prod bt x (v2t v)  (v2t' x f)
-    VAbs  bt   x f -> liftM  (Abs  bt x)         (v2t' x f)
+    VAbs  bt   x f -> Abs  bt x          (v2t' x f)
-    VInt n         -> return (EInt n)
+    VInt n         -> EInt n
-    VFloat f       -> return (EFloat f)
+    VFloat f       -> EFloat f
-    VString s      -> return (if null s then Empty else K s)
+    VString s      -> if null s then Empty else K s
-    VSort s        -> return (Sort s)
+    VSort s        -> Sort s
-    VImplArg v     -> liftM  ImplArg (v2t v)
+    VImplArg v     -> ImplArg (v2t v)
-    VTblType p res -> liftM2 Table (v2t p) (v2t res)
+    VTblType p res -> Table (v2t p) (v2t res)
-    VRecType rs    -> liftM  RecType (mapM (\(l,v) -> fmap ((,) l) (v2t v)) rs)
+    VRecType rs    -> RecType [(l, v2t v) | (l,v) <- rs]
-    VRec as        -> liftM  R       (mapM (\(l,v) -> v2t v >>= \t -> return (l,(Nothing,t))) as)
+    VRec as        -> R       [(l, (Nothing, v2t v)) | (l,v) <- as]
-    VV t _ vs      -> liftM  (V t)   (mapM v2t vs)
+    VV t _ vs      -> V t     (map v2t vs)
-    VT wild v cs   -> v2t v >>= \t -> liftM (T ((if wild then TWild else TTyped) t)) (mapM nfcase cs)
+    VT wild v cs   -> T ((if wild then TWild else TTyped) (v2t v)) (map nfcase cs)
-    VFV vs         -> liftM  FV (mapM v2t vs)
+    VFV vs         -> FV (map v2t vs)
-    VC v1 v2       -> liftM2 C (v2t v1) (v2t v2)
+    VC v1 v2       -> C (v2t v1) (v2t v2)
-    VS v1 v2       -> liftM2 S (v2t v1) (v2t v2)
+    VS v1 v2       -> S (v2t v1) (v2t v2)
-    VP v l         -> v2t v >>= \t -> return (P t l)
+    VP v l         -> P (v2t v) l
-    VPatt p        -> return (EPatt p)
+    VPatt p        -> EPatt p
-    VPattType v    -> v2t v >>= return . EPattType
+    VPattType v    -> EPattType $ v2t v
-    VAlts v vvs    -> liftM2 Alts (v2t v) (mapM (\(x,y) -> liftM2 (,) (v2t x) (v2t y)) vvs)
+    VAlts v vvs    -> Alts (v2t v) [(v2t x, v2t y) | (x,y) <- vvs]
-    VStrs vs       -> liftM  Strs (mapM v2t vs)
+    VStrs vs       -> Strs (map v2t vs)
 --  VGlue v1 v2    -> Glue (v2t v1) (v2t v2)
 --  VExtR v1 v2    -> ExtR (v2t v1) (v2t v2)
-    VError err     -> return (Error err)
+    VError err     -> Error err
  where
    applyMany f vs = foldl App f (map v2t vs)
    v2t = v2txs xs
    v2txs = value2term' stop loc
    v2t' x f = v2txs (x:xs) (bind f (gen xs))
    var j
-      | j<length xs = Right (Vr (reverse xs !! j))
+      | j<length xs = Vr (reverse xs !! j)
-      | otherwise   = Left  j
+      | otherwise   = error ("variable #"++show j++" is out of scope")
    pushs xs e = foldr push e xs
    push x (env,xs) = ((x,gen xs):env,x:xs)
    gen xs = VGen (length xs) []
-    nfcase (p,f) = liftM ((,) p) (v2txs xs' (bind f env'))
+    nfcase (p,f) = (,) p (v2txs xs' (bind f env'))
      where (env',xs') = pushs (pattVars p) ([],xs)
    bind (Bind f) x = if stop
--- a/src/compiler/GF/Compile/Compute/Predef.hs
+++ b/src/compiler/GF/Compile/Compute/Predef.hs
@@ -27,6 +27,10 @@ instance Predef Int where
 instance Predef Bool where
  toValue = boolV
  fromValue v = case v of
    VCApp (mn,i) [] | mn == cPredef && i == cPTrue -> return True
    VCApp (mn,i) [] | mn == cPredef && i == cPFalse -> return False
    _ -> verror "Bool" v
 instance Predef String where
  toValue = string
--- a/src/compiler/GF/Compile/Rename.hs
+++ b/src/compiler/GF/Compile/Rename.hs
@@ -23,9 +23,9 @@
 -----------------------------------------------------------------------------
 module GF.Compile.Rename (
-	       renameSourceTerm,
+     renameSourceTerm,
-	       renameModule
+     renameModule
-	      ) where
+    ) where
 import GF.Infra.Ident
 import GF.Infra.CheckM
--- a/src/compiler/GF/Compile/TypeCheck/Abstract.hs
+++ b/src/compiler/GF/Compile/TypeCheck/Abstract.hs
@@ -13,11 +13,11 @@
 -----------------------------------------------------------------------------
 module GF.Compile.TypeCheck.Abstract (-- * top-level type checking functions; TC should not be called directly.
-		  checkContext,
+    checkContext,
-		  checkTyp,
+    checkTyp,
-		  checkDef,
+    checkDef,
-		  checkConstrs,
+    checkConstrs,
-		 ) where
+   ) where
 import GF.Data.Operations
--- a/src/compiler/GF/Compile/TypeCheck/Concrete.hs
+++ b/src/compiler/GF/Compile/TypeCheck/Concrete.hs
@@ -69,7 +69,6 @@ computeLType gr g0 t = comp (reverse [(b,x, Vr x) | (b,x,_) <- g0] ++ g0) t
      lockRecType c t' ---- locking to be removed AR 20/6/2009
    _ | ty == typeTok -> return typeStr
    _ | isPredefConstant ty -> return ty
    _ -> composOp (comp g) ty
--- a/src/compiler/GF/Compile/TypeCheck/ConcreteNew.hs
+++ b/src/compiler/GF/Compile/TypeCheck/ConcreteNew.hs
@@ -396,7 +396,7 @@ tcRecTypeFields ge scope ((l,ty):rs) mb_ty = do
  return ((l,ty):rs,mb_ty)
 -- | Invariant: if the third argument is (Just rho),
-- 	            then rho is in weak-prenex form
+--              then rho is in weak-prenex form
 instSigma :: GlobalEnv -> Scope -> Term -> Sigma -> Maybe Rho -> TcM (Term, Rho)
 instSigma ge scope t ty1 Nothing    = return (t,ty1)           -- INST1
 instSigma ge scope t ty1 (Just ty2) = do                       -- INST2
@@ -568,9 +568,9 @@ unifyVar ge scope i env vs ty2 = do            -- Check whether i is bound
    Bound ty1       -> do v <- liftErr (eval ge env ty1)
                          unify ge scope (vapply (geLoc ge) v vs) ty2
    Unbound scope' _ -> case value2term (geLoc ge) (scopeVars scope') ty2 of
-                          Left i     -> let (v,_) = reverse scope !! i
+                          -- Left i     -> let (v,_) = reverse scope !! i
-                                        in tcError ("Variable" <+> pp v <+> "has escaped")
+                          --               in tcError ("Variable" <+> pp v <+> "has escaped")
-                          Right ty2' -> do ms2 <- getMetaVars (geLoc ge) [(scope,ty2)]
+                                ty2' -> do ms2 <- getMetaVars (geLoc ge) [(scope,ty2)]
                                           if i `elem` ms2
                                             then tcError ("Occurs check for" <+> ppMeta i <+> "in:" $$
                                                           nest 2 (ppTerm Unqualified 0 ty2'))
@@ -631,8 +631,8 @@ allBinders = [ identS [x]          | x <- ['a'..'z'] ] ++
 type Scope = [(Ident,Value)]
 type Sigma = Value
-type Rho   = Value	-- No top-level ForAll
+type Rho   = Value -- No top-level ForAll
-type Tau   = Value	-- No ForAlls anywhere
+type Tau   = Value -- No ForAlls anywhere
 data MetaValue
  = Unbound Scope Sigma
@@ -724,8 +724,8 @@ getMetaVars loc sc_tys = do
    go (Vr tv)    acc = acc
    go (App x y)  acc = go x (go y acc)
    go (Meta i)   acc
-	  | i `elem` acc  = acc
+      | i `elem` acc  = acc
-	  | otherwise	  = i : acc
+      | otherwise     = i : acc
    go (Q _)      acc = acc
    go (QC _)     acc = acc
    go (Sort _)   acc = acc
@@ -742,9 +742,9 @@ getFreeVars loc sc_tys = do
  return (foldr (go []) [] tys)
  where
    go bound (Vr tv)            acc
-	  | tv `elem` bound             = acc
+      | tv `elem` bound             = acc
-	  | tv `elem` acc               = acc
+      | tv `elem` acc               = acc
-	  | otherwise                   = tv : acc
+      | otherwise                   = tv : acc
    go bound (App x y)          acc = go bound x (go bound y acc)
    go bound (Meta _)           acc = acc
    go bound (Q _)              acc = acc
@@ -765,9 +765,9 @@ zonkTerm (Meta i) = do
 zonkTerm t = composOp zonkTerm t
 tc_value2term loc xs v =
-  case value2term loc xs v of
+  return $ value2term loc xs v
-    Left i  -> tcError ("Variable #" <+> pp i <+> "has escaped")
+    -- Old value2term error message:
-    Right t -> return t
+    -- Left i  -> tcError ("Variable #" <+> pp i <+> "has escaped")
--- a/src/compiler/GF/Compile/TypeCheck/TC.hs
+++ b/src/compiler/GF/Compile/TypeCheck/TC.hs
@@ -12,14 +12,15 @@
 -- Thierry Coquand's type checking algorithm that creates a trace
 -----------------------------------------------------------------------------
-module GF.Compile.TypeCheck.TC (AExp(..),
+module GF.Compile.TypeCheck.TC (
-	   Theory,
+    AExp(..),
-	   checkExp,
+    Theory,
-	   inferExp,
+    checkExp,
-	   checkBranch,
+    inferExp,
-	   eqVal,
+    checkBranch,
-	   whnf
+    eqVal,
-	  ) where
+    whnf
  ) where
 import GF.Data.Operations
 import GF.Grammar
@@ -127,10 +128,10 @@ checkExp th tenv@(k,rho,gamma) e ty = do
    Abs _ x t -> case typ of
      VClos env (Prod _ y a b) -> do
-	a' <- whnf $ VClos env a ---
+                           a' <- whnf $ VClos env a ---
-	(t',cs) <- checkExp th 
+                           (t',cs) <- checkExp th
-                           (k+1,(x,v x):rho, (x,a'):gamma) t (VClos ((y,v x):env) b)
+                                          (k+1,(x,v x):rho, (x,a'):gamma) t (VClos ((y,v x):env) b)
-	return (AAbs x a' t', cs)
+                           return (AAbs x a' t', cs)
      _ -> Bad (render ("function type expected for" <+> ppTerm Unqualified 0 e <+> "instead of" <+> ppValue Unqualified 0 typ))
    Let (x, (mb_typ, e1)) e2 -> do
@@ -205,8 +206,8 @@ inferExp th tenv@(k,rho,gamma) e = case e of
    case typ of
      VClos env (Prod _ x a b) -> do
        (a',csa) <- checkExp th tenv t (VClos env a)
-	b' <- whnf $ VClos ((x,VClos rho t):env) b
+        b' <- whnf $ VClos ((x,VClos rho t):env) b
-	return $ (AApp f' a' b', b', csf ++ csa)
+        return $ (AApp f' a' b', b', csf ++ csa)
      _ -> Bad (render ("Prod expected for function" <+> ppTerm Unqualified 0 f <+> "instead of" <+> ppValue Unqualified 0 typ))
   _ -> Bad (render ("cannot infer type of expression" <+> ppTerm Unqualified 0 e))
@@ -245,11 +246,11 @@ checkBranch th tenv b@(ps,t) ty = errIn ("branch" +++ show b) $
      typ <- whnf ty
      case typ of
        VClos env (Prod _ y a b) -> do
-	  a' <- whnf $ VClos env a
+          a' <- whnf $ VClos env a
          (p', sigma, binds, cs1) <- checkP tenv p y a'
          let tenv' = (length binds, sigma ++ rho, binds ++ gamma)
          ((ps',exp),cs2) <- chB tenv' ps2 (VClos ((y,p'):env) b)
-	  return ((p:ps',exp), cs1 ++ cs2) -- don't change the patt
+          return ((p:ps',exp), cs1 ++ cs2) -- don't change the patt
        _ -> Bad (render ("Product expected for definiens" <+> ppTerm Unqualified 0 t <+> "instead of" <+> ppValue Unqualified 0 typ))
    [] -> do
      (e,cs) <- checkExp th tenv t ty
@@ -307,8 +308,8 @@ checkPatt th tenv exp val = do
       case typ of
         VClos env (Prod _ x a b) -> do
           (a',_,csa) <- checkExpP tenv t (VClos env a)
-	   b' <- whnf $ VClos ((x,VClos rho t):env) b
+           b' <- whnf $ VClos ((x,VClos rho t):env) b
-	   return $ (AApp f' a' b', b', csf ++ csa)
+           return $ (AApp f' a' b', b', csf ++ csa)
         _ -> Bad (render ("Prod expected for function" <+> ppTerm Unqualified 0 f <+> "instead of" <+> ppValue Unqualified 0 typ))
     _ -> Bad (render ("cannot typecheck pattern" <+> ppTerm Unqualified 0 exp))
@@ -321,4 +322,3 @@ mkAnnot :: (Val -> AExp) -> Err (Val,[(Val,Val)]) -> Err (AExp,Val,[(Val,Val)])
 mkAnnot a ti = do
  (v,cs) <- ti
  return (a v, v, cs)
--- a/src/compiler/GF/Compile/Update.hs
+++ b/src/compiler/GF/Compile/Update.hs
@@ -34,14 +34,14 @@ buildAnyTree :: Fail.MonadFail m => ModuleName -> [(Ident,Info)] -> m (Map.Map I
 buildAnyTree m = go Map.empty
  where
    go map []         = return map
-    go map ((c,j):is) = do
+    go map ((c,j):is) =
      case Map.lookup c map of
        Just i  -> case unifyAnyInfo m i j of
-		     Ok k  -> go (Map.insert c k map) is
+          Ok k  -> go (Map.insert c k map) is
-		     Bad _ -> fail $ render ("conflicting information in module"<+>m $$
+          Bad _ -> fail $ render ("conflicting information in module"<+>m $$
-		                             nest 4 (ppJudgement Qualified (c,i)) $$
+                                  nest 4 (ppJudgement Qualified (c,i)) $$
-		                             "and" $+$
+                                  "and" $+$
-		                             nest 4 (ppJudgement Qualified (c,j)))
+                                  nest 4 (ppJudgement Qualified (c,j)))
        Nothing -> go (Map.insert c j map) is
 extendModule :: FilePath -> SourceGrammar -> SourceModule -> Check SourceModule
@@ -147,18 +147,18 @@ extendMod gr isCompl ((name,mi),cond) base new = foldM try new $ Map.toList (jme
      | not (cond c) = return new
      | otherwise    = case Map.lookup c new of
                         Just j -> case unifyAnyInfo name i j of
-		                     Ok k  -> return $ Map.insert c k new
+                                     Ok k  -> return $ Map.insert c k new
-		                     Bad _ -> do (base,j) <- case j of 
+                                     Bad _ -> do (base,j) <- case j of
-		                                               AnyInd _ m -> lookupOrigInfo gr (m,c)
+                                                               AnyInd _ m -> lookupOrigInfo gr (m,c)
-		                                               _          -> return (base,j)
+                                                               _          -> return (base,j)
-		                                 (name,i) <- case i of 
+                                                 (name,i) <- case i of
                                                               AnyInd _ m -> lookupOrigInfo gr (m,c)
                                                               _          -> return (name,i)
-		                                 checkError ("cannot unify the information" $$ 
+                                                 checkError ("cannot unify the information" $$
-		                                             nest 4 (ppJudgement Qualified (c,i)) $$
+                                                             nest 4 (ppJudgement Qualified (c,i)) $$
-		                                             "in module" <+> name <+> "with" $$
+                                                             "in module" <+> name <+> "with" $$
-		                                             nest 4 (ppJudgement Qualified (c,j)) $$
+                                                             nest 4 (ppJudgement Qualified (c,j)) $$
-		                                             "in module" <+> base)
+                                                             "in module" <+> base)
                         Nothing-> if isCompl
                                     then return $ Map.insert c (indirInfo name i) new
                                     else return $ Map.insert c i new
--- a/src/compiler/GF/Data/BacktrackM.hs
+++ b/src/compiler/GF/Data/BacktrackM.hs
@@ -16,18 +16,18 @@
 {-# LANGUAGE CPP #-}
 module GF.Data.BacktrackM (
                    -- * the backtracking state monad
-		    BacktrackM,
+                    BacktrackM,
-		    -- * monad specific utilities
+                    -- * monad specific utilities
-		    member,
+                    member,
-		    cut,
+                    cut,
-		    -- * running the monad
+                    -- * running the monad
-		    foldBM,          runBM,
+                    foldBM,          runBM,
-		    foldSolutions,   solutions,
+                    foldSolutions,   solutions,
-		    foldFinalStates, finalStates,
+                    foldFinalStates, finalStates,
-		    -- * reexport the 'MonadState' class
+                    -- * reexport the 'MonadState' class
-		    module Control.Monad.State.Class,
+                    module Control.Monad.State.Class,
-		  ) where
+                  ) where
 import Data.List
 import Control.Applicative
@@ -70,7 +70,7 @@ instance Applicative (BacktrackM s) where
 instance Monad (BacktrackM s) where
    return a   = BM (\c s b -> c a s b)
    BM m >>= k = BM (\c s b -> m (\a s b -> unBM (k a) c s b) s b)
-	where unBM (BM m) = m
+        where unBM (BM m) = m
 #if !(MIN_VERSION_base(4,13,0))
    fail = Fail.fail
--- a/src/compiler/GF/Data/Graph.hs
+++ b/src/compiler/GF/Data/Graph.hs
@@ -34,7 +34,7 @@ import Data.Set (Set)
 import qualified Data.Set as Set
 data Graph n a b = Graph [n] ![Node n a] ![Edge n b]
-		 deriving (Eq,Show)
+    deriving (Eq,Show)
 type Node n a = (n,a)
 type Edge n b = (n,n,b)
@@ -170,7 +170,7 @@ renameNodes :: (n -> m) -- ^ renaming function
            -> Graph n a b -> Graph m a b
 renameNodes newName c (Graph _ ns es) = Graph c ns' es'
    where ns' = map' (\ (n,x) -> (newName n,x)) ns
-	  es' = map' (\ (f,t,l) -> (newName f, newName t, l)) es
+          es' = map' (\ (f,t,l) -> (newName f, newName t, l)) es
 -- | A strict 'map'
 map' :: (a -> b) -> [a] -> [b]
--- a/src/compiler/GF/Data/Graphviz.hs
+++ b/src/compiler/GF/Data/Graphviz.hs
@@ -13,14 +13,14 @@
 -----------------------------------------------------------------------------
 module GF.Data.Graphviz (
-				  Graph(..), GraphType(..), 
+                          Graph(..), GraphType(..),
-				  Node(..), Edge(..),
+                          Node(..), Edge(..),
-				  Attr,
+                          Attr,
-                                  addSubGraphs,
+                          addSubGraphs,
-                                  setName,
+                          setName,
-                                  setAttr,
+                          setAttr,
-				  prGraphviz
+                          prGraphviz
-			) where
+                        ) where
 import Data.Char
@@ -76,8 +76,8 @@ prSubGraph g@(Graph _ i _ _ _ _) =
 prGraph :: Graph -> String
 prGraph (Graph t id at ns es ss) =
    unlines $ map (++";") (map prAttr at
-		           ++ map prNode ns 
+                           ++ map prNode ns
-		           ++ map (prEdge t) es
+                           ++ map (prEdge t) es
                           ++ map prSubGraph ss)
 graphtype :: GraphType -> String
@@ -96,7 +96,7 @@ edgeop Undirected = "--"
 prAttrList :: [Attr] -> String
 prAttrList [] = ""
-prAttrList at =	"[" ++ join "," (map prAttr at) ++ "]"
+prAttrList at = "[" ++ join "," (map prAttr at) ++ "]"
 prAttr :: Attr -> String
 prAttr (n,v) = esc n ++ " = " ++ esc v
--- a/src/compiler/GF/Data/Operations.hs
+++ b/src/compiler/GF/Data/Operations.hs
@@ -15,34 +15,34 @@
 -----------------------------------------------------------------------------
 module GF.Data.Operations (
-		   -- ** The Error monad
+     -- ** The Error monad
-		   Err(..), err, maybeErr, testErr, fromErr, errIn, 
+     Err(..), err, maybeErr, testErr, fromErr, errIn,
-		   lookupErr,
+     lookupErr,
-		   -- ** Error monad class
+     -- ** Error monad class
-		   ErrorMonad(..), checks, --doUntil, allChecks, checkAgain,
+     ErrorMonad(..), checks, --doUntil, allChecks, checkAgain,
-                   liftErr,
+                 liftErr,
-		   -- ** Checking
+     -- ** Checking
-		   checkUnique, unifyMaybeBy, unifyMaybe,
+     checkUnique, unifyMaybeBy, unifyMaybe,
-           -- ** Monadic operations on lists and pairs
+         -- ** Monadic operations on lists and pairs
-		   mapPairsM, pairM,
+     mapPairsM, pairM,
-		   -- ** Printing
+     -- ** Printing
-		   indent, (+++), (++-), (++++), (+++-), (+++++),
+     indent, (+++), (++-), (++++), (+++-), (+++++),
-		   prUpper, prReplicate, prTList, prQuotedString, prParenth, prCurly, 
+     prUpper, prReplicate, prTList, prQuotedString, prParenth, prCurly,
-		   prBracket, prArgList, prSemicList, prCurlyList, restoreEscapes,
+     prBracket, prArgList, prSemicList, prCurlyList, restoreEscapes,
-		   numberedParagraphs, prConjList, prIfEmpty, wrapLines,
+     numberedParagraphs, prConjList, prIfEmpty, wrapLines,
-		   -- ** Topological sorting
+     -- ** Topological sorting
-		   topoTest, topoTest2,
+     topoTest, topoTest2,
-		   -- ** Misc
+     -- ** Misc
-		   readIntArg,
+     readIntArg,
-		   iterFix,  chunks,
+     iterFix,  chunks,
-		  ) where
+    ) where
 import Data.Char (isSpace, toUpper, isSpace, isDigit)
 import Data.List (nub, partition, (\\))
@@ -204,7 +204,7 @@ topoTest2 g0 = maybe (Right cycles) Left (tsort g)
        ([],[]) -> Just []
        ([],_) -> Nothing
        (ns,rest) -> (leaves:) `fmap` tsort [(n,es \\ leaves) | (n,es)<-rest]
-	  where leaves = map fst ns
+            where leaves = map fst ns
 -- | Fix point iterator (for computing e.g. transitive closures or reachability)
--- a/src/compiler/GF/Data/Relation.hs
+++ b/src/compiler/GF/Data/Relation.hs
@@ -83,7 +83,7 @@ transitiveClosure r = fix (Map.map growSet) r
  where growSet ys = foldl Set.union ys (map (allRelated r) $ Set.toList ys)
 reflexiveClosure_ :: Ord a => [a] -- ^ The set over which the relation is defined.
-		 -> Rel a -> Rel a
+                  -> Rel a -> Rel a
 reflexiveClosure_ u r = relates [(x,x) | x <- u] r
 -- | Uses 'domain'
@@ -117,8 +117,8 @@ equivalenceClasses :: Ord a => Rel a -> [Set a]
 equivalenceClasses r = equivalenceClasses_ (Map.keys r) r
 where equivalenceClasses_ [] _ = []
       equivalenceClasses_ (x:xs) r = ys:equivalenceClasses_ zs r
-	   where ys = allRelated r x
+          where ys = allRelated r x
-                 zs = [x' | x' <- xs, not (x' `Set.member` ys)]
+                zs = [x' | x' <- xs, not (x' `Set.member` ys)]
 isTransitive :: Ord a => Rel a -> Bool
 isTransitive r = and [z `Set.member` ys | (x,ys) <- Map.toList r,
--- a/src/compiler/GF/Data/Utilities.hs
+++ b/src/compiler/GF/Data/Utilities.hs
@@ -33,7 +33,7 @@ longerThan    n = not . notLongerThan n
 lookupList :: Eq a => a -> [(a, b)] -> [b]
 lookupList a [] = []
 lookupList a (p:ps) | a == fst p = snd p : lookupList a ps
-		    | otherwise  =         lookupList a ps
+                    | otherwise  =         lookupList a ps
 split :: [a] -> ([a], [a])
 split (x : y : as) = (x:xs, y:ys)
@@ -48,8 +48,8 @@ splitBy p (a : as) = if p a then (a:xs, ys) else (xs, a:ys)
 foldMerge :: (a -> a -> a) -> a -> [a] -> a
 foldMerge merge zero = fm
    where fm [] = zero
-	  fm [a] = a
+          fm [a] = a
-	  fm abs = let (as, bs) = split abs in fm as `merge` fm bs
+          fm abs = let (as, bs) = split abs in fm as `merge` fm bs
 select :: [a] -> [(a, [a])]
 select [] = []
--- a/src/compiler/GF/Grammar/Lexer.x
+++ b/src/compiler/GF/Grammar/Lexer.x
@@ -267,7 +267,7 @@ type AlexInput2 = (AlexInput,AlexInput)
 data ParseResult a
  = POk AlexInput2 a
-  | PFailed Posn	-- The position of the error
+  | PFailed Posn        -- The position of the error
            String      -- The error message
 newtype P a = P { unP :: AlexInput2 -> ParseResult a }
--- a/src/compiler/GF/Grammar/Lookup.hs
+++ b/src/compiler/GF/Grammar/Lookup.hs
@@ -30,7 +30,7 @@ module GF.Grammar.Lookup (
           lookupFunType,
           lookupCatContext,
           allOpers, allOpersTo
-	      ) where
+          ) where
 import GF.Data.Operations
 import GF.Infra.Ident
--- a/src/compiler/GF/Grammar/PatternMatch.hs
+++ b/src/compiler/GF/Grammar/PatternMatch.hs
@@ -12,11 +12,12 @@
 -- pattern matching for both concrete and abstract syntax. AR -- 16\/6\/2003
 -----------------------------------------------------------------------------
-module GF.Grammar.PatternMatch (matchPattern,
+module GF.Grammar.PatternMatch (
-		     testOvershadow, 
+                                matchPattern,
-		     findMatch,
+                                testOvershadow,
-                     measurePatt
+                                findMatch,
-		    ) where
+                                measurePatt
                               ) where
 import GF.Data.Operations
 import GF.Grammar.Grammar
--- a/src/compiler/GF/Grammar/Printer.hs
+++ b/src/compiler/GF/Grammar/Printer.hs
@@ -175,18 +175,18 @@ ppTerm q d (Abs b v e)   = let (xs,e') = getAbs (Abs b v e)
                           in prec d 0 ('\\' <> commaPunct ppBind xs <+> "->" <+> ppTerm q 0 e')
 ppTerm q d (T TRaw xs) = case getCTable (T TRaw xs) of
                           ([],_) -> "table" <+> '{' $$
-	  		             nest 2 (vcat (punctuate ';' (map (ppCase q) xs))) $$
+                                       nest 2 (vcat (punctuate ';' (map (ppCase q) xs))) $$
-			             '}'
+                                     '}'
                           (vs,e) -> prec d 0 ("\\\\" <> commaPunct pp vs <+> "=>" <+> ppTerm q 0 e)
 ppTerm q d (T (TTyped t) xs) = "table" <+> ppTerm q 0 t <+> '{' $$
-			       nest 2 (vcat (punctuate ';' (map (ppCase q) xs))) $$
+                                 nest 2 (vcat (punctuate ';' (map (ppCase q) xs))) $$
-			       '}'
+                                '}'
 ppTerm q d (T (TComp  t) xs) = "table" <+> ppTerm q 0 t <+> '{' $$
-		 	       nest 2 (vcat (punctuate ';' (map (ppCase q) xs))) $$
+                                 nest 2 (vcat (punctuate ';' (map (ppCase q) xs))) $$
-			       '}'
+                               '}'
 ppTerm q d (T (TWild  t) xs) = "table" <+> ppTerm q 0 t <+> '{' $$
-			       nest 2 (vcat (punctuate ';' (map (ppCase q) xs))) $$
+                                 nest 2 (vcat (punctuate ';' (map (ppCase q) xs))) $$
-			       '}'
+                                '}'
 ppTerm q d (Prod bt x a b)= if x == identW && bt == Explicit
                              then prec d 0 (ppTerm q 4 a <+> "->" <+> ppTerm q 0 b)
                              else prec d 0 (parens (ppBind (bt,x) <+> ':' <+> ppTerm q 0 a) <+> "->" <+> ppTerm q 0 b)
@@ -198,14 +198,14 @@ ppTerm q d (C e1 e2)    =prec d 1 (hang (ppTerm q 2 e1) 2 ("++" <+> ppTerm q 1 e
 ppTerm q d (Glue e1 e2) =prec d 2 (ppTerm q 3 e1 <+> '+'  <+> ppTerm q 2 e2)
 ppTerm q d (S x y)     = case x of
                           T annot xs -> let e = case annot of
-			                           TRaw     -> y
+                                                   TRaw     -> y
-			                           TTyped t -> Typed y t
+                                                   TTyped t -> Typed y t
-			                           TComp  t -> Typed y t
+                                                   TComp  t -> Typed y t
-			                           TWild  t -> Typed y t
+                                                   TWild  t -> Typed y t
-			                 in "case" <+> ppTerm q 0 e <+>"of" <+> '{' $$
+                                         in "case" <+> ppTerm q 0 e <+>"of" <+> '{' $$
-			                    nest 2 (vcat (punctuate ';' (map (ppCase q) xs))) $$
+                                            nest 2 (vcat (punctuate ';' (map (ppCase q) xs))) $$
-			                   '}'
+                                           '}'
-			   _          -> prec d 3 (hang (ppTerm q 3 x) 2 ("!" <+> ppTerm q 4 y))
+                           _          -> prec d 3 (hang (ppTerm q 3 x) 2 ("!" <+> ppTerm q 4 y))
 ppTerm q d (ExtR x y)  = prec d 3 (ppTerm q 3 x <+> "**" <+> ppTerm q 4 y)
 ppTerm q d (App x y)   = prec d 4 (ppTerm q 4 x <+> ppTerm q 5 y)
 ppTerm q d (V e es)    = hang "table" 2 (sep [ppTerm q 6 e,brackets (fsep (punctuate ';' (map (ppTerm q 0) es)))])
@@ -362,4 +362,3 @@ getLet :: Term -> ([LocalDef], Term)
 getLet (Let l e) = let (ls,e') = getLet e
                   in (l:ls,e')
 getLet e         = ([],e)
--- a/src/compiler/GF/Grammar/Values.hs
+++ b/src/compiler/GF/Grammar/Values.hs
@@ -12,15 +12,16 @@
 -- (Description of the module)
 -----------------------------------------------------------------------------
-module GF.Grammar.Values (-- ** Values used in TC type checking
+module GF.Grammar.Values (
-	       Val(..), Env,
+               -- ** Values used in TC type checking
-	       -- ** Annotated tree used in editing
+               Val(..), Env,
               -- ** Annotated tree used in editing
               Binds, Constraints, MetaSubst,
-	       -- ** For TC
+               -- ** For TC
-	       valAbsInt, valAbsFloat, valAbsString, vType,
+               valAbsInt, valAbsFloat, valAbsString, vType,
-	       isPredefCat,
+               isPredefCat,
-	       eType, 
+               eType,
-	      ) where
+              ) where
 import GF.Infra.Ident
 import GF.Grammar.Grammar
--- a/src/compiler/GF/Infra/CheckM.hs
+++ b/src/compiler/GF/Infra/CheckM.hs
@@ -14,10 +14,10 @@
 module GF.Infra.CheckM
          (Check, CheckResult, Message, runCheck, runCheck',
-	   checkError, checkCond, checkWarn, checkWarnings, checkAccumError,
+           checkError, checkCond, checkWarn, checkWarnings, checkAccumError,
-	   checkIn, checkInModule, checkMap, checkMapRecover,
+           checkIn, checkInModule, checkMap, checkMapRecover,
           parallelCheck, accumulateError, commitCheck,
-	  ) where
+          ) where
 import Prelude hiding ((<>)) -- GHC 8.4.1 clash with Text.PrettyPrint
 import GF.Data.Operations
--- a/src/compiler/GF/Interactive.hs
+++ b/src/compiler/GF/Interactive.hs
@@ -38,7 +38,6 @@ import GF.Server(server)
 #endif
 import GF.Command.Messages(welcome)
 import GF.Infra.UseIO (Output)
 -- Provides an orphan instance of MonadFail for StateT in ghc versions < 8
 import Control.Monad.Trans.Instances ()
@@ -56,6 +55,7 @@ mainGFI opts files = do
 shell opts files = flip evalStateT (emptyGFEnv opts) $
                   do mapStateT runSIO $ importInEnv opts files
                      modify $ \ gfenv0 -> gfenv0 {history = [unwords ("i":files)]}
                      loop
 #ifdef SERVER_MODE
@@ -433,7 +433,7 @@ wc_type = cmd_name
        x2 = takeWhile (\c -> isIdent c || isSpace c || c == '-' || c == '=' || c == '"') x1
        cmd = case [x | (x,cs) <- RP.readP_to_S pCommand x2, all isSpace cs] of
-	        [x] -> Just x
+                [x] -> Just x
                _   -> Nothing
    isIdent c = c == '_' || c == '\'' || isAlphaNum c
--- a/src/compiler/GF/Interactive2.hs
+++ b/src/compiler/GF/Interactive2.hs
@@ -58,6 +58,7 @@ mainGFI opts files = do
 shell opts files = flip evalStateT (emptyGFEnv opts) $
                   do mapStateT runSIO $ importInEnv opts files
                      modify $ \ gfenv0 -> gfenv0 {history = [unwords ("i":files)]}
                      loop
 {-
@@ -436,7 +437,7 @@ wc_type = cmd_name
        x2 = takeWhile (\c -> isIdent c || isSpace c || c == '-' || c == '=' || c == '"') x1
        cmd = case [x | (x,cs) <- RP.readP_to_S pCommand x2, all isSpace cs] of
-	        [x] -> Just x
+                [x] -> Just x
                _   -> Nothing
    isIdent c = c == '_' || c == '\'' || isAlphaNum c
--- a/src/compiler/GF/Main.hs
+++ b/src/compiler/GF/Main.hs
@@ -16,18 +16,19 @@ import Data.Version
 import System.Directory
 import System.Environment (getArgs)
 import System.Exit
-import GF.System.Console (setConsoleEncoding)
+-- import GF.System.Console (setConsoleEncoding)
 -- | Run the GF main program, taking arguments from the command line.
 -- (It calls 'setConsoleEncoding' and 'getOptions', then 'mainOpts'.)
 -- Run @gf --help@ for usage info.
 main :: IO ()
 main = do
-  --setConsoleEncoding
+  -- setConsoleEncoding
  uncurry mainOpts =<< getOptions
 -- | Get and parse GF command line arguments. Fix relative paths.
 -- Calls 'getArgs' and 'parseOptions'.
 getOptions :: IO (Options, [FilePath])
 getOptions = do
  args <- getArgs
  case parseOptions args of
--- a/src/compiler/GF/Speech/FiniteState.hs
+++ b/src/compiler/GF/Speech/FiniteState.hs
@@ -12,15 +12,15 @@
 -- A simple finite state network module.
 -----------------------------------------------------------------------------
 module GF.Speech.FiniteState (FA(..), State, NFA, DFA,
-			      startState, finalStates,
+                              startState, finalStates,
-			      states, transitions,
+                              states, transitions,
                              isInternal,
-			      newFA, newFA_,
+                              newFA, newFA_,
-			      addFinalState,
+                              addFinalState,
-			      newState, newStates,
+                              newState, newStates,
                              newTransition, newTransitions,
                              insertTransitionWith, insertTransitionsWith,
-			      mapStates, mapTransitions,
+                              mapStates, mapTransitions,
                              modifyTransitions,
                              nonLoopTransitionsTo, nonLoopTransitionsFrom,
                              loops,
@@ -28,11 +28,11 @@ module GF.Speech.FiniteState (FA(..), State, NFA, DFA,
                              oneFinalState,
                              insertNFA,
                              onGraph,
-			      moveLabelsToNodes, removeTrivialEmptyNodes,
+                              moveLabelsToNodes, removeTrivialEmptyNodes,
                              minimize,
                              dfa2nfa,
                              unusedNames, renameStates,
-			      prFAGraphviz, faToGraphviz) where
+                              prFAGraphviz, faToGraphviz) where
 import Data.List
 import Data.Maybe
@@ -145,7 +145,7 @@ renameStates :: Ord x => [y] -- ^ Infinite supply of new names
 renameStates supply (FA g s fs) = FA (renameNodes newName rest g) s' fs'
    where (ns,rest) = splitAt (length (nodes g)) supply
          newNodes = Map.fromList (zip (map fst (nodes g)) ns)
-	  newName n = Map.findWithDefault (error "FiniteState.newName") n newNodes
+          newName n = Map.findWithDefault (error "FiniteState.newName") n newNodes
          s' = newName s
          fs' = map newName fs
@@ -182,9 +182,9 @@ oneFinalState nl el fa =
 moveLabelsToNodes :: (Ord n,Eq a) => FA n () (Maybe a) -> FA n (Maybe a) ()
 moveLabelsToNodes = onGraph f
  where f g@(Graph c _ _) = Graph c' ns (concat ess)
-	    where is = [ ((n,l),inc) | (n, (l,inc,_)) <- Map.toList (nodeInfo g)]
+         where is = [ ((n,l),inc) | (n, (l,inc,_)) <- Map.toList (nodeInfo g)]
-		  (c',is') = mapAccumL fixIncoming c is
+               (c',is') = mapAccumL fixIncoming c is
-		  (ns,ess) = unzip (concat is')
+               (ns,ess) = unzip (concat is')
 -- | Remove empty nodes which are not start or final, and have
@@ -234,17 +234,17 @@ fixIncoming :: (Ord n, Eq a) => [n]
                                                      -- incoming edges.
 fixIncoming cs c@((n,()),es) = (cs'', ((n,Nothing),es'):newContexts)
  where ls = nub $ map edgeLabel es
-	(cs',cs'') = splitAt (length ls) cs
+        (cs',cs'') = splitAt (length ls) cs
-	newNodes = zip cs' ls
+        newNodes = zip cs' ls
-	es' = [ (x,n,()) | x <- map fst newNodes ]
+        es' = [ (x,n,()) | x <- map fst newNodes ]
-	-- separate cyclic and non-cyclic edges
+        -- separate cyclic and non-cyclic edges
-	(cyc,ncyc) = partition (\ (f,_,_) -> f == n) es
+        (cyc,ncyc) = partition (\ (f,_,_) -> f == n) es
-	          -- keep all incoming non-cyclic edges with the right label
+                  -- keep all incoming non-cyclic edges with the right label
-	to (x,l) = [ (f,x,()) | (f,_,l') <- ncyc, l == l']
+        to (x,l) = [ (f,x,()) | (f,_,l') <- ncyc, l == l']
-	          -- for each cyclic edge with the right label, 
+                  -- for each cyclic edge with the right label,
-	          -- add an edge from each of the new nodes (including this one)
+                  -- add an edge from each of the new nodes (including this one)
-		    ++ [ (y,x,()) | (f,_,l') <- cyc, l == l', (y,_) <- newNodes]
+                  ++ [ (y,x,()) | (f,_,l') <- cyc, l == l', (y,_) <- newNodes]
-	newContexts = [ (v, to v) | v <- newNodes ]
+        newContexts = [ (v, to v) | v <- newNodes ]
 --alphabet :: Eq b => Graph n a (Maybe b) -> [b]
 --alphabet = nub . catMaybes . map edgeLabel . edges
@@ -254,18 +254,18 @@ determinize (FA g s f) = let (ns,es) = h (Set.singleton start) Set.empty Set.emp
                             (ns',es') = (Set.toList ns, Set.toList es)
                             final = filter isDFAFinal ns'
                             fa = FA (Graph undefined [(n,()) | n <- ns'] es') start final
- 		          in renameStates [0..] fa
+                         in renameStates [0..] fa
  where info = nodeInfo g
 --        reach = nodesReachable out
-	start = closure info $ Set.singleton s
+        start = closure info $ Set.singleton s
        isDFAFinal n = not (Set.null (Set.fromList f `Set.intersection` n))
-	h currentStates oldStates es
+        h currentStates oldStates es
-	    | Set.null currentStates = (oldStates,es)
+            | Set.null currentStates = (oldStates,es)
-	    | otherwise = ((h $! uniqueNewStates) $! allOldStates) $! es'
+            | otherwise = ((h $! uniqueNewStates) $! allOldStates) $! es'
-	    where 
+            where
-	    allOldStates = oldStates `Set.union` currentStates
+            allOldStates = oldStates `Set.union` currentStates
            (newStates,es') = new (Set.toList currentStates) Set.empty es
-	    uniqueNewStates = newStates Set.\\ allOldStates
+            uniqueNewStates = newStates Set.\\ allOldStates
        -- Get the sets of states reachable from the given states
        -- by consuming one symbol, and the associated edges.
        new [] rs es = (rs,es)
@@ -296,8 +296,8 @@ reachable1 info ns = Map.fromListWith (++) [(c, [y]) | n <- Set.toList ns, (_,y,
 reverseNFA :: NFA a -> NFA a
 reverseNFA (FA g s fs) = FA g''' s' [s]
    where g' = reverseGraph g
-	  (g'',s') = newNode () g'
+          (g'',s') = newNode () g'
-	  g''' = newEdges [(s',f,Nothing) | f <- fs] g''
+          g''' = newEdges [(s',f,Nothing) | f <- fs] g''
 dfa2nfa :: DFA a -> NFA a
 dfa2nfa = mapTransitions Just
@@ -316,10 +316,10 @@ faToGraphviz :: (Eq n,Show n) => FA n String String -> Dot.Graph
 faToGraphviz (FA (Graph _ ns es) s f)
    = Dot.Graph Dot.Directed Nothing [] (map mkNode ns) (map mkEdge es) []
   where mkNode (n,l) = Dot.Node (show n) attrs
-	     where attrs = [("label",l)]
+          where attrs = [("label",l)]
-			   ++ if n == s then [("shape","box")] else []
+                 ++ if n == s then [("shape","box")] else []
-			   ++ if n `elem` f then [("style","bold")] else []
+                 ++ if n `elem` f then [("style","bold")] else []
-	 mkEdge (x,y,l) = Dot.Edge (show x) (show y) [("label",l)]
+         mkEdge (x,y,l) = Dot.Edge (show x) (show y) [("label",l)]
 --
 -- * Utilities
--- a/src/compiler/GF/Speech/GSL.hs
+++ b/src/compiler/GF/Speech/GSL.hs
@@ -32,7 +32,7 @@ prGSL :: SRG -> Doc
 prGSL srg = header $++$ mainCat $++$ foldr ($++$) empty (map prRule (srgRules srg))
    where
    header = ";GSL2.0" $$
-	     comment ("Nuance speech recognition grammar for " ++ srgName srg) $$
+             comment ("Nuance speech recognition grammar for " ++ srgName srg) $$
             comment ("Generated by GF")
    mainCat = ".MAIN" <+> prCat (srgStartCat srg)
    prRule (SRGRule cat rhs) = prCat cat <+> union (map prAlt rhs)
--- a/src/compiler/GF/Speech/JSGF.hs
+++ b/src/compiler/GF/Speech/JSGF.hs
@@ -31,7 +31,7 @@ width :: Int
 width = 75
 jsgfPrinter :: Options
-	    -> PGF 
+            -> PGF
            -> CId -> String
 jsgfPrinter opts pgf cnc = renderStyle st $ prJSGF sisr $ makeNonLeftRecursiveSRG opts pgf cnc
  where st = style { lineLength = width }
@@ -44,7 +44,7 @@ prJSGF sisr srg
    header = "#JSGF" <+> "V1.0" <+> "UTF-8" <+> lang <> ';' $$
             comment ("JSGF speech recognition grammar for " ++ srgName srg) $$
             comment "Generated by GF" $$
-	     ("grammar " ++ srgName srg ++ ";") 
+             ("grammar " ++ srgName srg ++ ";")
    lang = maybe empty pp (srgLanguage srg)
    mainCat = rule True "MAIN" [prCat (srgStartCat srg)]
    prRule (SRGRule cat rhs) = rule (isExternalCat srg cat) cat (map prAlt rhs)
@@ -110,4 +110,3 @@ prepunctuate p (x:xs) = x : map (p <>) xs
 ($++$) :: Doc -> Doc -> Doc
 x $++$ y = x $$ emptyLine $$ y
--- a/src/compiler/GF/Speech/SRG.hs
+++ b/src/compiler/GF/Speech/SRG.hs
@@ -40,20 +40,20 @@ import qualified Data.Set as Set
 --import Debug.Trace
 data SRG = SRG { srgName :: String    -- ^ grammar name
-		 , srgStartCat :: Cat     -- ^ start category name
+               , srgStartCat :: Cat     -- ^ start category name
-                 , srgExternalCats :: Set Cat
+               , srgExternalCats :: Set Cat
-                 , srgLanguage :: Maybe String -- ^ The language for which the grammar 
+               , srgLanguage :: Maybe String -- ^ The language for which the grammar
-                                                   --   is intended, e.g. en-UK
+                                             --   is intended, e.g. en-UK
-	         , srgRules :: [SRGRule] 
+               , srgRules :: [SRGRule]
-	       }
+               }
-	 deriving (Eq,Show)
+        deriving (Eq,Show)
 data SRGRule = SRGRule Cat [SRGAlt]
-	     deriving (Eq,Show)
+        deriving (Eq,Show)
 -- | maybe a probability, a rule name and an EBNF right-hand side
 data SRGAlt = SRGAlt (Maybe Double) CFTerm SRGItem
-	      deriving (Eq,Show)
+        deriving (Eq,Show)
 type SRGItem = RE SRGSymbol
@@ -111,10 +111,10 @@ makeNonRecursiveSRG opts = mkSRG cfgToSRG id
 mkSRG :: (CFG -> [SRGRule]) -> (CFG -> CFG) -> PGF -> CId -> SRG
 mkSRG mkRules preprocess pgf cnc =
    SRG { srgName = showCId cnc,
-	  srgStartCat = cfgStartCat cfg,
+          srgStartCat = cfgStartCat cfg,
          srgExternalCats = cfgExternalCats cfg,
          srgLanguage = languageCode pgf cnc,
-	  srgRules = mkRules cfg }
+          srgRules = mkRules cfg }
    where cfg = renameCats (showCId cnc) $ preprocess $ pgfToCFG pgf cnc
 -- | Renames all external cats C to C_cat, and all internal cats C_X (where X is any string),
--- a/src/compiler/GF/Speech/SRGS_ABNF.hs
+++ b/src/compiler/GF/Speech/SRGS_ABNF.hs
@@ -38,7 +38,7 @@ width :: Int
 width = 75
 srgsAbnfPrinter :: Options
-	        -> PGF -> CId -> String
+                -> PGF -> CId -> String
 srgsAbnfPrinter opts pgf cnc = showDoc $ prABNF sisr $ makeNonLeftRecursiveSRG opts pgf cnc
    where sisr = flag optSISR opts
@@ -125,4 +125,3 @@ prepunctuate p (x:xs) = x : map (p <>) xs
 ($++$) :: Doc -> Doc -> Doc
 x $++$ y = x $$ emptyLine $$ y
--- a/src/compiler/GF/Speech/SRGS_XML.hs
+++ b/src/compiler/GF/Speech/SRGS_XML.hs
@@ -37,7 +37,7 @@ prSrgsXml sisr srg = showXMLDoc (optimizeSRGS xmlGr)
              [meta "description"
                 ("SRGS XML speech recognition grammar for " ++ srgName srg ++ "."),
               meta "generator" "Grammatical Framework"]
-	    ++ map ruleToXML (srgRules srg)
+               ++ map ruleToXML (srgRules srg)
    ruleToXML (SRGRule cat alts) = Tag "rule" ([("id",cat)]++pub) (prRhs alts)
        where pub = if isExternalCat srg cat then [("scope","public")] else []
    prRhs rhss = [oneOf (map (mkProd sisr) rhss)]
@@ -81,12 +81,12 @@ oneOf = Tag "one-of" []
 grammar :: Maybe SISRFormat
        -> String  -- ^ root
        -> Maybe String -- ^language
-	-> [XML] -> XML
+        -> [XML] -> XML
 grammar sisr root ml =
    Tag "grammar" $ [("xmlns","http://www.w3.org/2001/06/grammar"),
-		     ("version","1.0"),
+                     ("version","1.0"),
-		     ("mode","voice"),
+                     ("mode","voice"),
-		     ("root",root)]
+                     ("root",root)]
                 ++ (if isJust sisr then [("tag-format","semantics/1.0")] else [])
                 ++ maybe [] (\l -> [("xml:lang", l)]) ml
--- a/src/compiler/GF/Text/Transliterations.hs
+++ b/src/compiler/GF/Text/Transliterations.hs
@@ -142,7 +142,7 @@ transUrdu =
  (mkTransliteration "Urdu" allTrans allCodes) where
    allCodes = [0x0622 .. 0x062f] ++ [0x0630 .. 0x063a] ++ [0x0641,0x0642] ++ [0x06A9] ++ [0x0644 .. 0x0648] ++
               [0x0654,0x0658,0x0679,0x067e,0x0686,0x0688,0x0691,0x0698,0x06af,0x06c1,0x06c3,0x06cc,0x06ba,0x06be,0x06d2] ++
-			   [0x06f0 .. 0x06f9] ++ [0x061f,0x06D4]
+               [0x06f0 .. 0x06f9] ++ [0x061f,0x06D4]
    allTrans = words $
      "A - w^ - y^ a b - t C j H K d " ++  -- 0622 - 062f
      "Z r z s X S Z- t- z- e G "   ++  -- 0630 - 063a
@@ -156,7 +156,7 @@ transSindhi =
    allCodes = [0x062e] ++ [0x0627 .. 0x062f] ++ [0x0630 .. 0x063a] ++ [0x0641 .. 0x0648] ++
               [0x067a,0x067b,0x067d,0x067e,0x067f] ++ [0x0680 .. 0x068f] ++
               [0x0699,0x0918,0x06a6,0x061d,0x06a9,0x06af,0x06b3,0x06bb,0x06be,0x06f6,0x064a,0x06b1, 0x06aa, 0x06fd, 0x06fe] ++
-			   [0x06f0 .. 0x06f9] ++ [0x061f,0x06D4]
+               [0x06f0 .. 0x06f9] ++ [0x061f,0x06D4]
    allTrans = words $
      "K a b - t C j H - d " ++  -- 0626 - 062f
      "Z r z s X S Z- t- z- e G "   ++  -- 0630 - 063a
@@ -300,32 +300,30 @@ transAncientGreek = mkTransliteration "ancient Greek" allTrans allCodes where
 transAmharic :: Transliteration
 transAmharic = mkTransliteration "Amharic" allTrans allCodes where
- 
+  allTrans = words $
-allTrans = words $
+    " h.  h-  h'  h(  h)  h  h?  h*  l.  l-  l'  l(  l)  l  l?  l*  "++
-    
+    " H.  H-  H'  H(  H)  H  H?  H*  m.  m-  m'  m(  m)  m  m?  m*  "++
-  	" h.  h-  h'  h(  h)  h  h?  h*  l.  l-  l'  l(  l)  l  l?  l*  "++
+    " s.  s-  s'  s(  s)  s  s?  s*  r.  r-  r'  r(  r)  r  r?  r* "++
-	" H.  H-  H'  H(  H)  H  H?  H*  m.  m-  m'  m(  m)  m  m?  m*  "++
+    " -   -   -   -   -  -   -  -   x.  x-  x'  x(  x)  x  x?   x* "++
-	" s.  s-  s'  s(  s)  s  s?  s*  r.  r-  r'  r(  r)  r  r?  r* "++
+    " q.  q-  q'  q(  q)  q  q?  q*  -   -   -   -   -   -  -   - "++
-	" -   -   -   -   -  -   -  -   x.  x-  x'  x(  x)  x  x?   x* "++
+    " -   -   -   -   -   -  -   -   -   -   -   -   -   -  -   - "++
-	" q.  q-  q'  q(  q)  q  q?  q*  -   -   -   -   -   -  -   - "++
+    " b.  b-  b'  b(  b)  b  b?  b*  v.  v-  v'  v(  v)  v  v?  v* "++
-	" -   -   -   -   -   -  -   -   -   -   -   -   -   -  -   - "++
+    " t.  t-  t'  t(  t)  t  t?  t*  c.  c-  c'  c(  c)  c  c?  c* "++
-	" b.  b-  b'  b(  b)  b  b?  b*  v.  v-  v'  v(  v)  v  v?  v* "++
+    " X.  X-  X'  X(  X)  X  X?  -   -   -   -   X*  -   -  -   - "++
-	" t.  t-  t'  t(  t)  t  t?  t*  c.  c-  c'  c(  c)  c  c?  c* "++
+    " n.  n-  n'  n(  n)  n  n?  n*  N.  N-  N'  N(  N)  N  N?  N* "++
-	" X.  X-  X'  X(  X)  X  X?  -   -   -   -   X*  -   -  -   - "++
+    " a   u   i   A   E   e  o   e*  k.  k-  k'  k(  k)  k  k?  - "++
-	" n.  n-  n'  n(  n)  n  n?  n*  N.  N-  N'  N(  N)  N  N?  N* "++
+    " -   -   -   k*  -   -  -   -   -   -   -   -   -   -  -   - "++
-	" a   u   i   A   E   e  o   e*  k.  k-  k'  k(  k)  k  k?  - "++
+    " -   -   -   -   -   -  -   -   w.  w-  w'  w(  w)  w  w?  w* "++
-	" -   -   -   k*  -   -  -   -   -   -   -   -   -   -  -   - "++
+    " -   -   -   -   -   -  -   -   z.  z-  z'  z(  z)  z  z?  z* "++
-	" -   -   -   -   -   -  -   -   w.  w-  w'  w(  w)  w  w?  w* "++
+    " Z.  Z-  Z'  Z(  Z)  Z  Z?  Z*  y.  y-  y'  y(  y)  y  y?  y* "++
-	" -   -   -   -   -   -  -   -   z.  z-  z'  z(  z)  z  z?  z* "++
+    " d.  d-  d'  d(  d)  d  d?  d*  -   -   -   -   -   -  -   - "++
-	" Z.  Z-  Z'  Z(  Z)  Z  Z?  Z*  y.  y-  y'  y(  y)  y  y?  y* "++
+    " j.  j-  j'  j(  j)  j  j?  j*  g.  g-  g'  g(  g)  g  g?  - "++
-	" d.  d-  d'  d(  d)  d  d?  d*  -   -   -   -   -   -  -   - "++
+    " -   -   -   g*  -   -  -   -   -   -   -   -   -   -  -   - "++
-	" j.  j-  j'  j(  j)  j  j?  j*  g.  g-  g'  g(  g)  g  g?  - "++
+    " T.  T-  T'  T(  T)  T  T?  T*  C.  C-  C'  C(  C)  C  C?  C* "++
-	" -   -   -   g*  -   -  -   -   -   -   -   -   -   -  -   - "++
+    " P.  P-  P'  P(  P)  P  P?  P*  S.  S-  S'  S(  S)  S  S?  S* "++
-	" T.  T-  T'  T(  T)  T  T?  T*  C.  C-  C'  C(  C)  C  C?  C* "++
+    " -   -   -   -   -   -  -   -   f.  f-  f'  f(  f)  f  f?  f*"++
-	" P.  P-  P'  P(  P)  P  P?  P*  S.  S-  S'  S(  S)  S  S?  S* "++
+    " p.  p-  p'  p(  p)  p  p?  p*"
-	" -   -   -   -   -   -  -   -   f.  f-  f'  f(  f)  f  f?  f*"++
+  allCodes = [0x1200..0x1357]
 	" p.  p-  p'  p(  p)  p  p?  p*" 	
 allCodes = [0x1200..0x1357]
 -- by Prasad 31/5/2013
 transSanskrit :: Transliteration
--- a/src/compiler/SimpleEditor/Syntax.hs
+++ b/src/compiler/SimpleEditor/Syntax.hs
@@ -23,10 +23,10 @@ data Fun      = Fun      { fname:: FunId, ftype:: Type }
 data Concrete = Concrete { langcode:: Id,
                           opens:: [ModId],
-		           params:: [Param],
+                           params:: [Param],
-		           lincats:: [Lincat],
+                           lincats:: [Lincat],
-		           opers:: [Oper],
+                           opers:: [Oper],
-		           lins:: [Lin] }
+                           lins:: [Lin] }
                deriving Show
 data Param  = Param  {pname:: Id, prhs:: String}              deriving Show
--- a/src/runtime/c/INSTALL
+++ b/src/runtime/c/INSTALL
@@ -14,6 +14,9 @@ For Linux users
 You will need the packages: autoconf, automake, libtool, make
 - On Ubuntu: $ apt-get install autotools-dev
 - On Fedora: $ dnf install autoconf automake libtool
 The compilation steps are:
 $ autoreconf -i
@@ -28,7 +31,7 @@ For Mac OSX users
 The following is what I did to make it work on MacOSX 10.8:
 - Install XCode and XCode command line tools
- Install Homebrew: http://mxcl.github.com/homebrew/
+- Install Homebrew: https://brew.sh
 $ brew install automake autoconf libtool
 $ glibtoolize
--- a/src/runtime/c/install.sh
+++ b/src/runtime/c/install.sh
@@ -0,0 +1,3 @@
 bash setup.sh configure
 bash setup.sh build
 bash setup.sh install
--- a/src/runtime/haskell-bind/PGF2/Expr.hsc
+++ b/src/runtime/haskell-bind/PGF2/Expr.hsc
@@ -140,7 +140,9 @@ unStr (Expr expr touch) =
              touch
              return (Just s)
-- | Constructs an expression from an integer literal
+-- | Constructs an expression from an integer literal.
 -- Note that the C runtime does not support long integers, and you may run into overflow issues with large values.
 -- See [here](https://github.com/GrammaticalFramework/gf-core/issues/109) for more details.
 mkInt :: Int -> Expr
 mkInt val =
  unsafePerformIO $ do
--- a/src/runtime/haskell-bind/pgf2.cabal
+++ b/src/runtime/haskell-bind/pgf2.cabal
@@ -1,18 +1,21 @@
 name: pgf2
 version: 1.3.0
 cabal-version: 1.22
 build-type: Simple
 license: LGPL-3
 license-file: LICENSE
 category: Natural Language Processing
 synopsis: Bindings to the C version of the PGF runtime
 description:
  GF, Grammatical Framework, is a programming language for multilingual grammar applications.
  GF grammars are compiled into Portable Grammar Format (PGF) which can be used with the PGF runtime, written in C.
  This package provides Haskell bindings to that runtime.
-homepage: https://www.grammaticalframework.org
+homepage: https://www.grammaticalframework.org/
-license: LGPL-3
+bug-reports: https://github.com/GrammaticalFramework/gf-core/issues
 license-file: LICENSE
 author: Krasimir Angelov
 category: Natural Language Processing
 build-type: Simple
 extra-source-files: CHANGELOG.md, README.md
-cabal-version: >=1.10
+tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.10.4
 library
  exposed-modules:
@@ -23,9 +26,9 @@ library
    PGF2.Expr,
    PGF2.Type
  build-depends:
-    base >=4.3 && <5,
+    base >= 4.9.1 && < 4.15,
-    containers,
+    containers >= 0.5.7 && < 0.7,
-    pretty
+    pretty >= 1.1.3 && < 1.2
  default-language: Haskell2010
  build-tools: hsc2hs
  extra-libraries: pgf gu
--- a/src/runtime/haskell-bind/stack-ghc7.10.3.yaml
+++ b/src/runtime/haskell-bind/stack-ghc7.10.3.yaml
@@ -0,0 +1,3 @@
 resolver: lts-6.35 # ghc 7.10.3
 allow-newer: true
--- a/src/runtime/haskell-bind/stack-ghc8.0.2.yaml
+++ b/src/runtime/haskell-bind/stack-ghc8.0.2.yaml
@@ -0,0 +1 @@
 resolver: lts-9.21 # ghc 8.0.2
--- a/src/runtime/haskell-bind/stack-ghc8.10.4.yaml
+++ b/src/runtime/haskell-bind/stack-ghc8.10.4.yaml
@@ -0,0 +1 @@
 resolver: lts-18.0 # ghc 8.10.4
--- a/src/runtime/haskell/PGF/Binary.hs
+++ b/src/runtime/haskell/PGF/Binary.hs
@@ -185,6 +185,7 @@ instance Binary Instr where
  put (PUSH_ACCUM (LFlt d)) = putWord8 78 >> put d
  put (POP_ACCUM          ) = putWord8 80
  put (ADD                ) = putWord8 84
  get = fail "Missing implementation for ‘get’ in the instance declaration for ‘Binary Instr’"
 instance Binary Type where
  put (DTyp hypos cat exps) = put (hypos,cat,exps)
--- a/src/runtime/haskell/pgf.cabal
+++ b/src/runtime/haskell/pgf.cabal
@@ -1,29 +1,32 @@
 name: pgf
-version: 3.10.1-git
+version: 3.11.0-git
-cabal-version: >= 1.20
+cabal-version: 1.22
 build-type: Simple
 license: OtherLicense
 category: Natural Language Processing
 synopsis: Grammatical Framework
 description: A library for interpreting the Portable Grammar Format (PGF)
-homepage: http://www.grammaticalframework.org/
+homepage: https://www.grammaticalframework.org/
 bug-reports: https://github.com/GrammaticalFramework/gf-core/issues
-tested-with: GHC==7.6.3, GHC==7.8.3, GHC==7.10.3, GHC==8.0.2, GHC==8.4.4
+tested-with: GHC==7.10.3, GHC==8.0.2, GHC==8.10.4
 library
  default-language: Haskell2010
  build-depends:
-    array,
+    array >= 0.5.1 && < 0.6,
-    base >= 4.6 && <5,
+    base >= 4.9.1 && < 4.15,
-    bytestring,
+    bytestring >= 0.10.8 && < 0.11,
-    containers,
+    containers >= 0.5.7 && < 0.7,
-    -- exceptions,
+    ghc-prim >= 0.5.0 && < 0.7,
-    ghc-prim,
+    mtl >= 2.2.1 && < 2.3,
-    mtl,
+    pretty >= 1.1.3 && < 1.2,
-    pretty,
+    random >= 1.1 && < 1.3,
-    random,
+    utf8-string >= 1.0.1.1 && < 1.1
-    utf8-string
+
  if impl(ghc<8.0)
    build-depends:
      fail >= 4.9.0 && < 4.10
  other-modules:
    -- not really part of GF but I have changed the original binary library
--- a/src/runtime/haskell/stack-ghc7.10.3.yaml
+++ b/src/runtime/haskell/stack-ghc7.10.3.yaml
@@ -0,0 +1,3 @@
 resolver: lts-6.35 # ghc 7.10.3
 allow-newer: true
--- a/src/runtime/haskell/stack-ghc8.0.2.yaml
+++ b/src/runtime/haskell/stack-ghc8.0.2.yaml
@@ -0,0 +1 @@
 resolver: lts-9.21 # ghc 8.0.2
--- a/src/runtime/haskell/stack-ghc8.10.4.yaml
+++ b/src/runtime/haskell/stack-ghc8.10.4.yaml
@@ -0,0 +1 @@
 resolver: lts-18.0 # ghc 8.10.4
--- a/src/server/URLEncoding.hs
+++ b/src/server/URLEncoding.hs
@@ -45,8 +45,8 @@ fromhex2 d1 d2 = 16*digitToInt d1+digitToInt d2
 -- Repeatedly extract (and transform) values until a predicate hold.  Return the list of values.
 unfoldr :: (a -> (b, a)) -> (a -> Bool) -> a -> [b]
 unfoldr f p x | p x       = []
-	      | otherwise = y:unfoldr f p x'
+              | otherwise = y:unfoldr f p x'
-			      where (y, x') = f x
+                              where (y, x') = f x
 chopList :: ([a] -> (b, [a])) -> [a] -> [b]
 chopList f l = unfoldr f null l
@@ -54,8 +54,8 @@ chopList f l = unfoldr f null l
 breakAt :: (Eq a) => a -> [a] -> ([a], [a])
 breakAt _ [] = ([], [])
 breakAt x (x':xs) =
-	if x == x' then
+    if x == x' then
-	    ([], xs)
+        ([], xs)
-	else
+    else
-	    let (ys, zs) = breakAt x xs
+        let (ys, zs) = breakAt x xs
-	    in  (x':ys, zs)
+        in  (x':ys, zs)
--- a/src/server/transfer/Fold.hs
+++ b/src/server/transfer/Fold.hs
@@ -13,8 +13,8 @@ fold t =
  case unApp t of
    Just (i,[x])  ->
        case M.lookup i foldable of
-	        Just j -> appFold j x
+          Just j -> appFold j x
-	        _      -> mkApp i [fold x]
+          _      -> mkApp i [fold x]
    Just (i,xs)   -> mkApp i $ map fold xs
    _             -> t
--- a/stack-ghc8.10.4.yaml
+++ b/stack-ghc8.10.4.yaml
@@ -0,0 +1,14 @@
 resolver: lts-18.0 # ghc 8.10.4
 extra-deps:
 - network-2.6.3.6
 - httpd-shed-0.4.0.3
 - cgi-3001.5.0.0@sha256:3d1193a328d5f627a021a0ef3927c1ae41dd341e32dba612fed52d0e3a6df056,2990
 - json-0.10@sha256:d9fc6b07ce92b8894825a17d2cf14799856767eb30c8bf55962baa579207d799,3210
 - multipart-0.2.0@sha256:b8770e3ff6089be4dd089a8250894b31287cca671f3d258190a505f9351fa8a9,1084
 # flags:
 #   gf:
 #     c-runtime: true
 # extra-lib-dirs:
 #   - /usr/local/lib
--- a/stack.yaml
+++ b/stack.yaml
@@ -1,13 +1,15 @@
-# This default stack file is a copy of stack-ghc8.6.5.yaml
+# This default stack file is a copy of stack-ghc8.10.4.yaml
 # But committing a symlink can be problematic on Windows, so it's a real copy.
 # See: https://github.com/GrammaticalFramework/gf-core/pull/106
-resolver: lts-14.27 # ghc 8.6.5
+resolver: lts-18.0 # ghc 8.10.4
 extra-deps:
 - network-2.6.3.6
 - httpd-shed-0.4.0.3
- cgi-3001.5.0.0
+- cgi-3001.5.0.0@sha256:3d1193a328d5f627a021a0ef3927c1ae41dd341e32dba612fed52d0e3a6df056,2990
 - json-0.10@sha256:d9fc6b07ce92b8894825a17d2cf14799856767eb30c8bf55962baa579207d799,3210
 - multipart-0.2.0@sha256:b8770e3ff6089be4dd089a8250894b31287cca671f3d258190a505f9351fa8a9,1084
 # flags:
 #   gf:
Author	SHA1	Message	Date
Inari Listenmaa	810640822d	Update documentation for release 3.11	2021-07-25 15:37:12 +08:00
Inari Listenmaa	ed79955931	Merge pull request #129 from anka-213/automate-release Automatically upload release assets after building for release	2021-07-25 08:20:41 +02:00
Andreas Källberg	1867bfc8a1	Rename packages based on git tag	2021-07-25 11:08:21 +08:00
Andreas Källberg	6ef4f27d32	Upload release assets automatically as well	2021-07-25 10:43:36 +08:00
Inari Listenmaa	3ab07ec58f	Update debian changelog for GF 3.11	2021-07-25 10:30:49 +08:00
Inari Listenmaa	b8324fe3e6	Merge pull request #116 from anka-213/fix-binary-package-build Update scripts to use `cabal v1-...` so they work on newer cabal	2021-07-25 04:15:07 +02:00
Andreas Källberg	8814fde817	Only run the script once per release	2021-07-25 09:30:36 +08:00
Andreas Källberg	375b3cf285	Update release script to build for two ubuntu versions	2021-07-25 08:23:25 +08:00
Andreas Källberg	3c4f42db15	Build ubuntu packages on ubuntu-latest Fixes #74	2021-07-25 08:23:25 +08:00
John J. Camilleri	0474a37af6	Make Makefile compatible with stack and old/new cabal (with v1- prefix when necessary)	2021-07-25 08:23:25 +08:00
Andreas Källberg	e3498d5ead	Update to newest haskell github action Also fix so the stack builds use the correct ghc versions	2021-07-25 08:23:25 +08:00
Andreas Källberg	4c5927c98c	Update scripts to use `cabal v1-...` so they work on newer cabal Fixes build failures like https://github.com/GrammaticalFramework/gf-core/runs/2949099280?check_suite_focus=true	2021-07-25 08:23:25 +08:00
John J. Camilleri	bb51224e8e	IRC link pre-fills channel. Link to logs gives newest first.	2021-07-23 16:07:34 +02:00
John J. Camilleri	9533edc3ca	Merge pull request #128 from GrammaticalFramework/windows-binary Fixes to building Windows binary	2021-07-23 15:55:37 +02:00
John J. Camilleri	4df8999ed5	Change Python 3.8 to 3.9	2021-07-23 08:05:35 +02:00
John J. Camilleri	7fdbf3f400	Update path in main workflow for binaries	2021-07-22 23:11:01 +02:00
John J. Camilleri	0d6c67f6b1	Try without rewriting envvar	2021-07-22 23:02:22 +02:00
John J. Camilleri	2610219f6a	Update path	2021-07-22 22:56:39 +02:00
John J. Camilleri	7674f078d6	Try another path	2021-07-22 22:49:44 +02:00
John J. Camilleri	c67fe05c08	Narrow search, print env var	2021-07-22 22:44:53 +02:00
John J. Camilleri	7b9bb780a2	Find Java stuff	2021-07-22 22:34:26 +02:00
John J. Camilleri	4f256447e2	Add separate Windows binary CI action for easier testing	2021-07-22 22:27:15 +02:00
Inari Listenmaa	dfa5b9276d	#gf IRC channel has moved to Libera	2021-07-22 01:08:00 +02:00
Inari Listenmaa	667bfd30bd	Merge pull request #87 from anka-213/make-it-fast Remove the `Either Int` from value2term	2021-07-20 04:35:37 +02:00
Inari Listenmaa	66ae31e99e	Merge pull request #126 from inariksit/developers-documentation Update developers' documentation	2021-07-15 05:16:55 +02:00
Inari Listenmaa	a677f0373c	General restructuring, various minor changes	2021-07-15 10:40:26 +08:00
Inari Listenmaa	13f845d127	Update C runtime instructions	2021-07-15 10:39:54 +08:00
Inari Listenmaa	aa530233fb	Remove instructions to create binaries Those are in github actions	2021-07-15 10:27:57 +08:00
Inari Listenmaa	45bc5595c0	Update C runtime install instructions	2021-07-15 09:54:15 +08:00
Inari Listenmaa	6d12754e4f	Split the Cabal instructions to another page and link from main instructions	2021-07-15 08:21:29 +08:00
1Regina	a09d9bd006	install and upgrade stack	2021-07-14 17:20:20 +08:00
Meowyam	fffe3161d4	updated docs to reflect binaries generated via github actions fix merge conflicts resolve merge conflict	2021-07-14 17:20:20 +08:00
Meowyam	743f5e55d4	add missing install.sh file for c runtime	2021-07-14 17:20:20 +08:00
Inari Listenmaa	9e209bbaba	Changes in Git instructions	2021-07-14 17:20:07 +08:00
Inari Listenmaa	a1594e6a69	updated doc with instructions for C runtime for ubuntu and fedora	2021-07-14 16:44:44 +08:00
Inari Listenmaa	06e0a986d1	Changes in Git instructions	2021-07-14 16:12:11 +08:00
Meowyam	6f2a4bcd2c	update doc for linux installation	2021-07-14 15:32:02 +08:00
Inari Listenmaa	f345f615f4	Update information about test suite Co-Authored-By: 1Regina <46968488+1Regina@users.noreply.github.com>	2021-07-14 15:16:23 +08:00
Inari Listenmaa	80d16fcf94	Update instructions about C runtime	2021-07-14 15:03:59 +08:00
Andreas Källberg	7faf8c9dad	Clean up redundant case expressions	2021-07-12 16:38:29 +08:00
Andreas Källberg	c2ffa6763b	Github actions: Fix build for stack	2021-07-12 15:53:49 +08:00
Andreas Källberg	b3881570c7	Remove last traces of the Either in value2term	2021-07-12 15:53:49 +08:00
Andreas Källberg	bd270b05ff	Remove the `Either Int` from value2term This prevents HUGE space leak and makes compiling a PGF a LOT faster For example, an application grammar moved from taking over 50GB of ram and taking 5 minutes (most of which is spent on garbage colelction) to taking 1.2 seconds and using 42mb of memory The price we pay is that the "variable #n is out of scope" error is now lazy and will happen when we try to evaluate the term instead of happening when the function returns and allowing the caller to chose how to handle the error. I don't think this should matter in practice, since it's very rare; at least Inari has never encountered it.	2021-07-12 15:50:43 +08:00
John J. Camilleri	a1fd3ea142	Fix bug introduced in `cdbe73eb47` Apparently I don't understand how pattern-matching works in Haskell	2021-07-08 13:56:58 +02:00
John J. Camilleri	cdbe73eb47	Remove two missing-methods warnings	2021-07-08 12:10:41 +02:00
John J. Camilleri	6077d5dd5b	Merge pull request #124 from GrammaticalFramework/cabal-cleanup More cabal file cleanup	2021-07-08 08:56:31 +02:00
John J. Camilleri	0954b4cbab	More cabal file cleanup. Remove some more tabs from Haskell source.	2021-07-07 13:04:09 +02:00
John J. Camilleri	f2e52d6f2c	Replace tabs for whitespace in source code	2021-07-07 09:40:41 +02:00
John J. Camilleri	a2b23d5897	Make whitespace uniform in Cabal files, add a few more dependency bounds	2021-07-07 09:11:46 +02:00
John J. Camilleri	0886eb520d	Update 3.11 release notes	2021-07-06 15:45:21 +02:00
John J. Camilleri	ef42216415	Add import from command line invocation to command history Closes #64	2021-07-06 15:35:03 +02:00
John J. Camilleri	0c3ca3d79a	Add note in PGF2 documentation about risk for integer overflow. Closes #109	2021-07-06 14:43:21 +02:00
John J. Camilleri	e2e5033075	Merge pull request #122 from 2jacobtan/master specify version bounds in *.cabal files	2021-07-06 14:31:29 +02:00
John J. Camilleri	84b4b6fab9	Some more cabal file cleanup. Add stack files for pgf, pgf2.	2021-07-06 14:11:30 +02:00
Inari Listenmaa	5e052ff499	Merge pull request #119 from GrammaticalFramework/concrete-new Clean up Compute.ConcreteNew and TypeCheck.RConcrete	2021-07-06 14:05:00 +02:00
2jacobtan	e1a40640cd	specify version bounds in pgf.cabal and pgf2.cabal	2021-07-06 05:42:34 +08:00
2jacobtan	be231584f6	set stack.yaml to lts-18.0	2021-07-06 05:20:09 +08:00
2jacobtan	12c564f97c	specify version bounds in gf.cabal	2021-07-06 05:08:00 +08:00
		`@@ -0,0 +1,3 @@`
							`resolver: lts-6.35 # ghc 7.10.3`

							`allow-newer: true`