John J. Camilleri
6a8d0038ed
Merge pull request #46 from odanoburu/construct
...
(Eng) use Extend instead of Extra in Construction
2018-07-17 16:32:36 +02:00
John J. Camilleri
f9331526d1
More cleanup in Setup and WebSetup
2018-07-05 15:22:05 +02:00
John J. Camilleri
8b5532c1e9
Relax dependency on directory package for Setup
...
Since `listDirectory` is no longer used (852a49920)
2018-07-05 14:21:05 +02:00
Krasimir Angelov
73cf58da23
revert to a version compatible with Cabal 1.22
2018-07-05 13:10:02 +02:00
Krasimir Angelov
e95aa16fdc
Merge branch 'master' of https://github.com/GrammaticalFramework/GF
2018-07-05 13:01:46 +02:00
John J. Camilleri
0ef7fb8b0f
Cleanup in Setup.hs; include custom-setup:setup-depends in cabal file.
2018-07-05 12:23:02 +02:00
John J. Camilleri
992af4ab97
Clean up imports in Setup.hs
...
Really just for my own understanding
2018-07-05 10:32:40 +02:00
Krasimir Angelov
ce83d8490b
Merge branch 'master' of https://github.com/GrammaticalFramework/GF
2018-07-05 09:13:04 +02:00
John J. Camilleri
af82dc9fc6
Fix make sdist to use git archive instead of darcs dist
2018-07-04 14:28:25 +02:00
John J. Camilleri
a6b1db71cd
Remove more remnants from the darcs days
2018-07-04 14:21:44 +02:00
John J. Camilleri
40cc58d6c1
Replace Distribution.Simple.Utils.noticeNoWrap with putStr
...
Effect is the same and I don't want to upset the package dependencies
2018-07-04 14:00:56 +02:00
John J. Camilleri
b9b0217160
Remove code which tries to get version information from darcs folder
2018-07-04 13:40:46 +02:00
Krasimir Angelov
f64b17eef7
Merge branch 'master' of https://github.com/GrammaticalFramework/GF
...
Conflicts:
examples/phrasebook/SentencesBul.gf
examples/phrasebook/WordsBul.gf
2018-07-04 13:09:39 +02:00
Krasimir Angelov
7bfd6199d6
a majour refactoring to support clitic pronouns
2018-07-04 13:01:06 +02:00
John J. Camilleri
c6f4edaea5
Remove examples directory; these now live in gf-contrib
...
All changes have been reflected in the gf-contrib repository:
https://github.com/GrammaticalFramework/gf-contrib
Now, for WebSetup to build the example grammars, one must have gf-contrib
cloned in the same top-level directory as GF. When this isn't the case,
WebSetup displays a notice without failing.
2018-07-04 10:09:58 +02:00
Krasimir Angelov
00476ae386
Merge branch 'master' of https://github.com/GrammaticalFramework/GF
2018-06-27 20:52:59 +02:00
Thomas Hallgren
23961ef0b3
GF.Server: add 'import Control.Applicative' for compatibilit with GHC<7.10
...
One could also add stricter version constraints in gf.cabal, e.g.
base>=4.8 (implies GHC>=7.10) if we want to only support building with
GHC>=7.10.
2018-06-27 17:40:35 +02:00
Krasimir Angelov
97da247d21
Merge branch 'master' of https://github.com/GrammaticalFramework/GF
2018-06-27 11:54:24 +02:00
Krasimir Angelov
6c4c22ff7a
undo the partial fix for word completion since it breaks normal parsing
2018-06-27 11:53:40 +02:00
Krasimir Angelov
5afaa39c19
Merge branch 'master' of https://github.com/GrammaticalFramework/GF
2018-06-23 22:47:32 +02:00
Inari Listenmaa
73cc57c7e0
Merge pull request #64 from odanoburu/por
...
(Por) add more preposition cases and CountNP
2018-06-21 14:16:58 +02:00
Krasimir Angelov
68db7695f5
a simple fix for the linearizer
2018-06-20 22:21:10 +02:00
Krasimir Angelov
b86373438b
Revert "when linearizing missing functions with brackets, the name of the function should still be reported"
...
This reverts commit 18204bdd25bd460904ac475f3ea340daa96589df.
2018-06-20 21:16:19 +02:00
Krasimir Angelov
4cdd4dd8a7
Revert "forgot to switch off the debugger"
...
This reverts commit 5919dfa3366dfd2f2af8c3ce7749d066a2033f0d.
2018-06-20 21:13:58 +02:00
odanoburu
f067267953
Merge remote-tracking branch 'upstream/master' into por
2018-06-20 12:33:05 -03:00
Krasimir Angelov
427f8d8478
forgot to switch off the debugger
2018-06-20 16:36:45 +02:00
Krasimir Angelov
aaefe4310d
when linearizing missing functions with brackets, the name of the function should still be reported
2018-06-20 16:35:28 +02:00
Krasimir Angelov
65cfdf1775
added bracketedLinearizeAll
2018-06-20 13:51:41 +02:00
Krasimir Angelov
d8eac259e4
Merge branch 'master' of https://github.com/GrammaticalFramework/GF
2018-06-20 13:06:15 +02:00
Krasimir Angelov
09d576f5b4
bracketedLinearize in Haskell now emits the BIND constructor like in Java
2018-06-20 13:05:15 +02:00
John J. Camilleri
485938103c
Remove wide coverage translator
...
It had now been migrated to a new repository:
https://github.com/GrammaticalFramework/wide-coverage
2018-06-20 10:06:22 +02:00
John J. Camilleri
6ce57c0505
Homepage minors
...
- add Travis build status icon
- make Github link point to org rather than repo
2018-06-20 09:55:53 +02:00
Krasimir Angelov
96f3484622
Merge branch 'master' of https://github.com/GrammaticalFramework/GF
2018-06-16 07:09:17 +02:00
Inari Listenmaa
9d2b92dbc1
Split gftest to a new repo
2018-06-15 14:31:21 +02:00
Inari Listenmaa
2d9240e036
Merge pull request #62 from inariksit/dutch
...
Small fixes in Dutch
2018-06-15 14:05:06 +02:00
Inari Listenmaa
92d9e20f19
(Dut) Extend vs. Extra
2018-06-15 13:14:53 +02:00
John J. Camilleri
71c7fbc7f9
Remove oldstyle.css
2018-06-14 10:11:11 +02:00
John J. Camilleri
f0c5d53e78
Remove editor mode files from Haskell package (in gf.cabal)
2018-06-13 10:18:25 +02:00
John J. Camilleri
4ca52bf763
Add TypeScript type definitions for gflib.js
2018-06-13 09:52:20 +02:00
John J. Camilleri
22b754d23b
Clean up old download pages
2018-06-13 08:47:33 +02:00
Aarne Ranta
013f3573e6
added transliteration arabic_unvocalized, which omits the vowels
2018-06-12 20:39:39 +02:00
John J. Camilleri
5aa2a212bb
Remove HTML files from VC which should be generated from txt2tags
...
If these pages disappear from the web via www.grammaticalframework.org
then this commit may need to be reversed
2018-06-12 15:53:58 +02:00
John J. Camilleri
27b49e0a8b
Remove /framenet redirect for the sake of cleaning things up
2018-06-12 15:43:28 +02:00
John J. Camilleri
d0ce46722b
Minor cleanup in webpages
2018-06-12 15:41:05 +02:00
Inari Listenmaa
baa74e7b32
Merge pull request #59 from inariksit/gftest
...
(gftest) Fixes/additions when comparing against older version
2018-06-12 14:53:06 +02:00
Inari Listenmaa
df6c9e047e
(gftest) Compare also functions of arity 0 + custom startcat for comparison
2018-06-12 14:35:03 +02:00
John J. Camilleri
e969948a47
Remove .authorspellings (it was a darcs relic and now useless)
2018-06-11 22:10:32 +02:00
John J. Camilleri
ffb74b2f3d
Merge branch 'master' of github.com:GrammaticalFramework/GF
2018-06-09 20:44:24 +02:00
odanoburu
8b05ed9469
Merge remote-tracking branch 'upstream/master' into por
2018-06-06 09:51:42 -03:00
Inari Listenmaa
54be69f2b8
Merge pull request #55 from inariksit/dutch
...
Dutch smart paradigms + remove commented out code
2018-06-05 11:50:24 +02:00