diff options
| author | Krasimir Angelov <kr.angelov@gmail.com> | 2017-12-09 23:05:32 +0100 |
|---|---|---|
| committer | Krasimir Angelov <kr.angelov@gmail.com> | 2017-12-09 23:05:32 +0100 |
| commit | 515ea697ba3274f28cb0f8c1f2a36e3c49391b6c (patch) | |
| tree | 40e60352f5c48eea7a64097f800f284aa6547dd9 | |
| parent | 7260d5496d8f28a686f6d3af26e9f52aae0aa0c8 (diff) | |
| parent | 79feeaf5b8f4a7b1a9bcf5f08cec19d2164fdfc4 (diff) | |
Merge branch 'master' of https://github.com/GrammaticalFramework/GF
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | doc/gf-editor-modes.t2t | 16 | ||||
| -rw-r--r-- | src/compiler/GF/Command/Commands.hs | 4 |
3 files changed, 15 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore index 8bcdd3c46..1c083eded 100644 --- a/.gitignore +++ b/.gitignore @@ -41,3 +41,5 @@ src/runtime/java/.libs/ src/runtime/python/build/ src/ui/android/libs/ src/ui/android/obj/ +.cabal-sandbox +cabal.sandbox.config diff --git a/doc/gf-editor-modes.t2t b/doc/gf-editor-modes.t2t index 64d998e06..d9368dd32 100644 --- a/doc/gf-editor-modes.t2t +++ b/doc/gf-editor-modes.t2t @@ -17,15 +17,16 @@ welcome! automatic indentation and lets you run the GF Shell in an emacs buffer. See installation instructions inside. +==Atom== +[language-gf https://atom.io/packages/language-gf], by John J. Camilleri + ==Eclipse== -[GF Eclipse Plugin http://www.grammaticalframework.org/eclipse/index.html] +[GF Eclipse Plugin http://www.grammaticalframework.org/eclipse/index.html], by John J. Camilleri ==Gedit== -[John J. Camilleri http://johnjcamilleri.com/] -provided the following syntax highlighting mode for -[Gedit http://www.gedit.org/] (the default text editor in Ubuntu). +By John J. Camilleri Copy the file below to ``~/.local/share/gtksourceview-3.0/language-specs/gf.lang`` (under Ubuntu). @@ -37,7 +38,7 @@ Some helpful notes/links: - The code is based heavily on the ``haskell.lang`` file which I found in ``/usr/share/gtksourceview-2.0/language-specs/haskell.lang``. -- Ruslan Osmanov recommends +- Ruslan Osmanov recommends [registering your file extension as its own MIME type http://osmanov-dev-notes.blogspot.com/2011/04/how-to-add-new-highlight-mode-in-gedit.html] (see also [here https://help.ubuntu.com/community/AddingMimeTypes]), however on my system the ``.gf`` extension was already registered @@ -51,8 +52,9 @@ Some helpful notes/links: ==Geany== -[John J. Camilleri http://johnjcamilleri.com/] provided the following -[custom filetype http://www.geany.org/manual/dev/index.html#custom-filetypes] +By John J. Camilleri + +[Custom filetype http://www.geany.org/manual/dev/index.html#custom-filetypes] config files for syntax highlighting in [Geany http://www.geany.org/]. Copy one of the files below to ``/usr/share/geany/filetypes.GF.conf`` diff --git a/src/compiler/GF/Command/Commands.hs b/src/compiler/GF/Command/Commands.hs index 27b72b5c4..3ca2ab962 100644 --- a/src/compiler/GF/Command/Commands.hs +++ b/src/compiler/GF/Command/Commands.hs @@ -275,6 +275,7 @@ pgfCommands = Map.fromList [ ("list","show all forms and variants, comma-separated on one line (cf. l -all)"), ("multi","linearize to all languages (default)"), ("table","show all forms labelled by parameters"), + ("tabtreebank","show the tree and its linearizations on a tab-separated line"), ("treebank","show the tree and tag linearizations with language names") ] ++ stringOpOptions, flags = [ @@ -791,6 +792,9 @@ pgfCommands = Map.fromList [ _ | isOpt "treebank" opts -> (showCId (abstractName pgf) ++ ": " ++ showExpr [] t) : [showCId lang ++ ": " ++ s | lang <- optLangs pgf opts, s<-linear pgf opts lang t] + _ | isOpt "tabtreebank" opts -> + return $ concat $ intersperse "\t" $ (showExpr [] t) : + [s | lang <- optLangs pgf opts, s <- linear pgf opts lang t] _ | isOpt "chunks" opts -> map snd $ linChunks pgf opts t _ -> [s | lang <- optLangs pgf opts, s<-linear pgf opts lang t] linChunks pgf opts t = |