summaryrefslogtreecommitdiff
path: root/src/GF
diff options
context:
space:
mode:
authoraarne <unknown>2005-07-01 07:16:31 +0000
committeraarne <unknown>2005-07-01 07:16:31 +0000
commitd27fd4913b504189e531caa0365ec29357f35447 (patch)
treea011dd5837272a4c474d45826184f12291832e52 /src/GF
parent4d94cdfd66c63eb01ad90c292f3dc75878a0e8a7 (diff)
vt -o ; Finnish infinitives
Diffstat (limited to 'src/GF')
-rw-r--r--src/GF/Shell.hs6
-rw-r--r--src/GF/Shell/HelpFile.hs9
-rw-r--r--src/GF/Shell/ShellCommands.hs6
3 files changed, 14 insertions, 7 deletions
diff --git a/src/GF/Shell.hs b/src/GF/Shell.hs
index ac5a5d660..8ae01017c 100644
--- a/src/GF/Shell.hs
+++ b/src/GF/Shell.hs
@@ -5,9 +5,9 @@
-- Stability : (stable)
-- Portability : (portable)
--
--- > CVS $Date: 2005/06/20 16:14:19 $
+-- > CVS $Date: 2005/07/01 08:16:32 $
-- > CVS $Author: aarne $
--- > CVS $Revision: 1.41 $
+-- > CVS $Revision: 1.42 $
--
-- GF shell command interpreter.
-----------------------------------------------------------------------------
@@ -208,6 +208,8 @@ execC co@(comm, opts0) sa@((st,(h,_)),a) = checkOptions st co >> case comm of
_ -> Nothing
returnArg (ATrms $ generateTrees opts gro mt) sa
+ CShowTreeGraph | oElem emitCode opts -> do -- -o
+ returnArg (AString $ visualizeTrees opts $ strees $ s2t a) sa
CShowTreeGraph -> do
let g0 = writeFile "grphtmp.dot" $ visualizeTrees opts $ strees $ s2t a
g1 = system "dot -Tps grphtmp.dot >grphtmp.ps"
diff --git a/src/GF/Shell/HelpFile.hs b/src/GF/Shell/HelpFile.hs
index 6a95ff7bf..6a1b55d33 100644
--- a/src/GF/Shell/HelpFile.hs
+++ b/src/GF/Shell/HelpFile.hs
@@ -5,9 +5,9 @@
-- Stability : (stable)
-- Portability : (portable)
--
--- > CVS $Date: 2005/06/20 16:14:19 $
+-- > CVS $Date: 2005/07/01 08:16:32 $
-- > CVS $Author: aarne $
--- > CVS $Revision: 1.6 $
+-- > CVS $Revision: 1.7 $
--
-- Help on shell commands. Generated from HelpFile by 'make help'.
-- PLEASE DON'T EDIT THIS FILE.
@@ -317,6 +317,11 @@ txtHelpFile =
"\n -c show categories only (no functions)" ++
"\n -f show functions only (no categories)" ++
"\n -g show as graph (sharing uses of the same function)" ++
+ "\n -o just generate the .dot file" ++
+ "\n examples:" ++
+ "\n p \"hello world\" | vt -o | wf my.dot ;; ! open -a GraphViz my.dot" ++
+ "\n -- This writes the parse tree into my.dot and opens the .dot file" ++
+ "\n -- with another application without generating .ps." ++
"\n" ++
"\n-- subshells" ++
"\n" ++
diff --git a/src/GF/Shell/ShellCommands.hs b/src/GF/Shell/ShellCommands.hs
index e2b809b21..9d6718faf 100644
--- a/src/GF/Shell/ShellCommands.hs
+++ b/src/GF/Shell/ShellCommands.hs
@@ -5,9 +5,9 @@
-- Stability : (stable)
-- Portability : (portable)
--
--- > CVS $Date: 2005/06/20 16:14:20 $
+-- > CVS $Date: 2005/07/01 08:16:32 $
-- > CVS $Author: aarne $
--- > CVS $Revision: 1.38 $
+-- > CVS $Revision: 1.39 $
--
-- The datatype of shell commands and the list of their options.
-----------------------------------------------------------------------------
@@ -191,7 +191,7 @@ optionsOfCommand co = case co of
CSpeakAloud -> flags "language"
CPutString -> both "utf8" "filter length"
CShowTerm -> flags "printer"
- CShowTreeGraph -> opts "c f g"
+ CShowTreeGraph -> opts "c f g o"
CSystemCommand _ -> none
CPrintGrammar -> both "utf8" "printer lang"