Commit Graph
100 Commits
Author SHA1 Message Date
bjorn 338d4132c4 Merge mine and aarne's variants linearization changes. 2008-10-03 09:53:25 +00:00
bjorn 3e3ba03724 Don't build FV terms if there is exactly one variant. 2008-10-03 08:18:24 +00:00
bjorn ae13f4f2c9 Fixed variants semantics in PGF linearization to expand make variants of argument lists, to get things like Auto/Wagen gender right. 2008-10-03 07:53:37 +00:00
bjorn 4b41039a5d Added | syntax for variants. 2008-10-03 07:35:26 +00:00
bjorn 6d4d6bce68 Handle concatenations with variants in PGF.ShowLinearize, fixes http://trac.haskell.org/gf/ticket/23 2008-10-03 07:16:39 +00:00
bjorn f362f6ad01 Regenerate source GF parser from GF.cf. Now, when GF/Source/Makefile is used, no hand-hacking is needed. 2008-10-02 14:11:41 +00:00
bjorn 2fc5c7f579 Added src/GF/Source/Makefile for regenerating the GF source parser from GF.cf. 2008-10-02 13:42:24 +00:00
bjorn c21d0d10b8 Converted GF/Source/*.hs to Unix line endings, to be able to see what happens when I regenerated the files. 2008-10-02 13:23:54 +00:00
bjorn 7c30f07f75 Fail more gracefully on unknown file name extensions. 2008-10-02 12:32:03 +00:00
bjorn cec77015ad Use parantheses for precedence in pgf-pretty lincats. 2008-09-30 12:02:58 +00:00
bjorn 14373feb3a Added --cfg option for specifying which CFG transformations to use. Added startcatonly CFG trasnformation. Removed output formats that are now easily done with --cfg: "regular", "nolr". 2008-09-30 11:52:11 +00:00
bjorn ed7d52843b Fixed CFG start cats for categories with more than one constituent. 2008-09-30 10:53:36 +00:00
bjorn 3ad9d12c81 Use filtering in regular printer. 2008-09-30 09:39:09 +00:00
bjorn e1d90c00b9 SRG conversion: print CFG when a unknown cat is found in renameCats. Do filtering in ebnf printer. 2008-09-30 09:32:16 +00:00
bjorn 6791378846 pgf-pretty: remove single field record lincat hack. handle f "" (S []) correctly. 2008-09-30 09:31:31 +00:00
bjorn 662663ffa3 Some pgf-pretty fixes, including note by Peter about W "apa" (S []). 2008-09-30 07:24:01 +00:00
bjorn 2884598b7c Added pgf-pretty output-format 2008-09-26 15:21:32 +00:00
bjorn 0e869a3574 Added isLiteralCat function to PGF.Macros. 2008-09-26 15:04:13 +00:00
bjorn f377af2617 Added 'complete' function to the PGF API. This is a higher-level API to the completion functionality. 2008-09-26 13:17:21 +00:00
bjorn 8fe2a1cc59 Added semantic interpretation tag printing to the *bnf grammar printers. 2008-09-26 12:57:20 +00:00
bjorn b64d25b3be Use ebnf format for "regular" output-format. 2008-09-26 10:20:18 +00:00
bjorn a84849bee2 Changed nolr printer to use EBNF format. 2008-09-26 10:03:42 +00:00
bjorn 9010afef50 ebnf printer: print external cats first. 2008-09-26 09:58:57 +00:00
bjorn d54ba6f112 bnf and ebnf printer: align ::= symbols. 2008-09-26 09:54:09 +00:00
bjorn 93e9d60765 SRG category renaming: don't count the external cats when calculating indices. 2008-09-26 09:44:02 +00:00
bjorn d80c71f688 Changed SRG category renaming to use GF cat + index among CFG cats for that GF cat, instead of the old Concrete syntax name + index among all CFG cats. 2008-09-26 09:39:48 +00:00
bjorn c588e8ca2b Oops, I accidentally disabled all CFG simplification and LR-removal with the ENBF printing patch. 2008-09-26 09:39:04 +00:00
bjorn 8c348f963f Change category naming in CFG generation: the number now starts from 1 for each GF category, instead of being the FCFG category number. 2008-09-26 09:28:03 +00:00
bjorn 824d72bf16 Added --output-format=ebnf. 2008-09-26 09:20:39 +00:00
bjorn 84dec7aaa2 In CFG generation: don't add linrow number if the lincat has only a single constituent. 2008-09-26 09:06:52 +00:00
bjorn 367cc0acb9 Added --output-format=nolr. Minor makeRegular refactoring. 2008-09-25 13:41:07 +00:00
bjorn 8001ea8ea0 Added --output-format=regular. 2008-09-25 11:49:00 +00:00
bjorn 4d96eb7e9a Fixe copy-paste error: srgs_abnf_nonrec produced xml, fixed now. 2008-09-25 11:36:04 +00:00
bjorn 716250bcf1 Somewhat nicer FCFG output format. 2008-09-25 08:44:23 +00:00
bjorn 90b2441c34 Added an FCFG output format (--output-format=fcfg). This now lives in GF.Speech.PGFToCFG, but should probably move somewhere else. 2008-09-25 08:41:49 +00:00
bjorn 0d1b2c01b9 Got SRGS ABNF generation to compile. 2008-09-23 12:56:25 +00:00
bjorn 66d4909142 Added srgs_abnf_nonrec grammar printer to GF.Infra.Options. 2008-09-23 12:44:17 +00:00
bjorn c01af6168b Re-added old PrSRGS_ABNF (does not compile yet). 2008-09-23 12:41:44 +00:00
bjorn 3d11bf48a3 GWT: somewhat nicer iterable() hack. 2008-09-22 10:11:15 +00:00
bjorn 491a829105 Added iterable() method for nicer iteration through GF method results. (GWT) 2008-09-21 20:37:27 +00:00
bjorn 279ba4823b Fixed gf-morpho-server.cabal name typo. Added basic README for morpho server. 2008-09-18 20:12:01 +00:00
bjorn bc2447bcbb GWT: disable translation until the language info has been loaded from the server, 2008-09-17 13:25:08 +00:00
bjorn 7c79fd0aa9 GWT: update to use new /grammar resource. Select from language based on Accept-Language header. 2008-09-17 13:04:10 +00:00
bjorn 0896d6dee1 fastcgi: rename /info to /grammar 2008-09-17 12:42:05 +00:00
bjorn 4a2bac3cf2 fastcgi: replace /categories, /languages and /mylanguage with /info. 2008-09-17 12:37:34 +00:00
bjorn 9265be0326 fastcgi server: add /mylanguage resource, which selects the language that best matches the Accept-language header. 2008-09-17 12:22:17 +00:00
bjorn ee40c265b7 GWT: comment out flag icon stuff in CSS. 2008-09-17 11:40:35 +00:00
bjorn 64bbd08edd Towards looking at the locale for default language. Added flag icons. 2008-09-17 10:12:36 +00:00
bjorn 64728d1205 Better error handling in GWT UI. 2008-09-16 13:53:07 +00:00
bjorn 70f8bc0f99 Convert StructuralCat.gf to ISO-8859-1, it was UTF-8 but without a coding flag (except "algú?"). 2008-09-15 20:03:57 +00:00
bjorn a691f4dfaf GWT client: set Accept header to get plain text error messages, 2008-09-15 15:43:37 +00:00
bjorn 62a872b033 Added loading popup to gwt ui 2008-09-15 15:27:33 +00:00
bjorn a43ed0f99f fastcgi server: decode UTF-8 inputs produced by the gwt client 2008-09-15 15:20:15 +00:00
bjorn 1579174e14 gwt installball should not contain gf.fcgi 2008-09-15 14:40:05 +00:00
bjorn ca9b011b27 GWT: only allow a single compeltion request at a time. 2008-09-15 14:39:25 +00:00
bjorn 59065bb6fc Use abs path for gf.fcgi in gwt client. 2008-09-15 14:16:56 +00:00
bjorn b9ec6b089f Fixes to the GWT UI to be able to run it on other machines (still some hardcoded paths in the compilation). 2008-09-15 13:49:55 +00:00
bjorn c2da4129ed Added partial word completion to fastcgi server and update GWT UI accordingly. 2008-09-15 13:33:40 +00:00
bjorn 3857f4a6a6 A somewhat better solution to the words/UTF-8 problem: do encoding last, but only on what appears to be string literals. 2008-09-15 13:16:04 +00:00
bjorn a39f8cc5da Temporary fix for the grave accent a encoding problem: change compatPrint to id.
The problem is that lower case a with a grave accent is coded in UTF-8 as \195\160. 
Unicode character \160 is non-breaking space, so Haskell's words function
will break a UTF-8 encoded string at this character.
String literals in the .gfo file are UTF-8 encoded in generateModuleCode,
just before the call to prGrammar (which uses compactPrint, which used words).
The real solution would be to pretty-print the grammar to Unicode, and then
encode as UTF-8. The problem with that is Latin-1 identifers. They are now
kept in Latin-1 in the .gfo file, since Alex can't handle Unicode.
The real solution to that would be to fix Alex to handle Unicode, but 
that is non-trivial. GHC interally uses a very hacky .x file to be
able to lex UTF-8 source files. 

An alternative solution that doesn't address the weirdness of using two different
encodings in the same .gfo as we do now, is to incorporate compactPrint
into the grammar printer, to avoid having to do any postprocessing.
2008-09-15 12:38:37 +00:00
bjorn 1c16b6b6e2 Somewhat nicer gwt client ui style. 2008-09-12 21:07:14 +00:00
bjorn 75b0279a11 GWT client now has the same func 2008-09-12 11:47:41 +00:00
bjorn ddd4d418c0 server: changes lang field to name 2008-09-12 11:32:30 +00:00
bjorn 9cebc28e8e Update gf-client.html with new gf.fcgi output types. 2008-09-12 11:14:02 +00:00
bjorn a282f868bc Change JSON structures returned by the translation server to always be arrays of objects. 2008-09-12 11:05:38 +00:00
bjorn 78a86d6092 translation server: added limit argument to /complete. 2008-09-12 10:13:16 +00:00
bjorn 585368e003 Started working on Google Web Toolkit version of translation server ui. 2008-09-12 10:03:12 +00:00
bjorn f5d3c17777 Fix binary-dist to include gfc and exclude compiled grammars, since the latter didn't work anyway. NOTE: you must re-run autoconf (actually the previous patch is the one that requires this). 2008-09-11 08:35:17 +00:00
bjorn 257636ec21 Remove old editor shell script and configure stuff. 2008-09-11 08:30:29 +00:00
bjorn b2e874b057 Change version number in configure.ac to 3.0-beta2 too. 2008-09-10 12:48:34 +00:00
bjorn f772cded9e Added temporary completions button to AJAX translation UI. 2008-09-10 11:57:00 +00:00
bjorn 3f4d79eba1 Note about deleting /tmp/fcgi_ipc 2008-09-10 11:55:10 +00:00
bjorn a49362f225 missing sudo in erver README 2008-09-10 11:52:45 +00:00
bjorn a16bb8b40d mod_fastcgi installation instructions in src/server/README 2008-09-10 08:44:18 +00:00
bjorn 6dbc576426 Note that Apache must be restarted after config changes. 2008-09-10 08:19:50 +00:00
bjorn 26d8a7254d Fix type error in fastcgi server.
I forgot to fix this after I copied the modified FastCGIUtils from morpho-server.
2008-09-10 07:09:44 +00:00
bjorn 7826a445b0 More info in src/server/README. 2008-09-09 12:38:45 +00:00
bjorn 9e3b3f1bd2 Disable translation on every keystroke, and completion, in the gf FastCGI AJAX client, since it can be too slow. 2008-09-09 12:19:28 +00:00
bjorn af2dbf293a Updated JS editor to the latest version from Moises. 2008-09-09 09:32:32 +00:00
bjorn dbe3571fcc Added --haskell-prefix option for changing the constructor prefix in generated Haskell modules. 2008-09-03 15:42:11 +00:00
bjorn 27fdc19b20 Added missing space in Constructors.gf whose absence introduced an extra space in the library synopsis. 2008-08-29 08:41:38 +00:00
bjorn 1919fe99a6 gf-server: the readData function given to getData should be m a, not IO a. 2008-08-24 20:44:30 +00:00
bjorn 85bfb64e2a First (hacky) working version of FastCGI JSON morphology server. 2008-08-24 19:31:12 +00:00
bjorn f8487ec6b9 Move CGIError stuff to FastCGIUtils. 2008-08-24 19:12:44 +00:00
bjorn 646bf9c4d8 URL decode text input in fastcgi server, including %uXXXX sequences. 2008-08-24 17:39:24 +00:00
bjorn 2ffc138e52 Overload mkAdv in TrySwe. 2008-08-24 14:53:45 +00:00
bjorn f246747496 Completed SISR 1.0 support (untested). 2008-08-24 14:53:21 +00:00
bjorn c42e4c0690 Export modifyFlags and modifyModuleFlags from GF.Infra.Options. 2008-08-24 14:52:49 +00:00
bjorn b8fae8f5a4 Re-enable Catalan in the server demo grammar. 2008-08-24 10:19:44 +00:00
bjorn c80538e068 Added target for building translation server grammar for LangX. 2008-08-23 10:33:16 +00:00
bjorn 45ab3ea0d9 Added README with build instructions for the fastcgi server. 2008-08-22 13:16:31 +00:00
bjorn 0e80a79e1d Don't include DemoCat in server example grammar, since some parts are missing. 2008-08-22 13:15:51 +00:00
bjorn 849c146973 UTF8 encode all generated XML. 2008-08-22 09:47:42 +00:00
bjorn acf1a17268 In GF.Compile.Export, output file name extensions should not have double dots. 2008-08-22 09:27:44 +00:00
bjorn 440d9c49b9 Renamed the gf3 executable to gf in GF.cabal 2008-08-22 08:45:40 +00:00
bjorn 243bd895e4 Added srgs_xml_nonrec output format. 2008-08-22 08:43:58 +00:00
bjorn b73f03b366 Removed Overload modules from GF.cabal. 2008-08-22 07:18:34 +00:00
bjorn 921798bc2a Added target to lib/resource/Makefile for building a tarball of the compiled resource library. 2008-08-22 07:06:07 +00:00
bjorn a16b87f441 Use overloaded API in peace keeping grammar. Still not compiling, "no instance of mkS for Cl among ... Cl ... ?" 2008-08-19 14:35:45 +00:00
bjorn 7616c2ea23 removed some dead code from gflib.js 2008-08-19 14:08:02 +00:00