From 0786dc6f42fdbf6a4039ffb47667c85d405af625 Mon Sep 17 00:00:00 2001
From: aarne <aarne@chalmers.se>
Date: Wed, 4 Nov 2015 20:36:47 +0000
Subject: dependency labels in parse trees now with the -deps flag,
 -file=labels_file for configuration. With -nocat option this shows reasonable
 dep trees, more familiar looking than the vd command. With -showfun flag, the
 tree gives a rather complete picture of the analysis of the sentence.

---
 src/compiler/GF/Command/Commands.hs | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'src/compiler/GF/Command/Commands.hs')

diff --git a/src/compiler/GF/Command/Commands.hs b/src/compiler/GF/Command/Commands.hs
index 32612df2c..015ba4931 100644
--- a/src/compiler/GF/Command/Commands.hs
+++ b/src/compiler/GF/Command/Commands.hs
@@ -572,7 +572,7 @@ pgfCommands = Map.fromList [
        ("v","show extra information")
        ],
      flags = [
-       ("file","configuration file for labels per fun, format 'fun l1 ... label ... l2'"),
+       ("file","configuration file for labels, format per line 'fun label*'"),
        ("format","format of the visualization file (default \"png\")"),
        ("output","output format of graph source (default \"dot\")"),
        ("view","program to open the resulting file (default \"open\")"),
@@ -597,7 +597,7 @@ pgfCommands = Map.fromList [
          let gvOptions = GraphvizOptions {noLeaves = isOpt "noleaves" opts && not (isOpt "showleaves" opts),
                                           noFun = isOpt "nofun" opts || not (isOpt "showfun" opts),
                                           noCat = isOpt "nocat" opts && not (isOpt "showcat" opts),
-                                          noDep = True, ---- TODO
+                                          noDep = not (isOpt "deps" opts),
                                           nodeFont = valStrOpts "nodefont" "" opts,
                                           leafFont = valStrOpts "leaffont" "" opts,
                                           nodeColor = valStrOpts "nodecolor" "" opts,
@@ -605,9 +605,14 @@ pgfCommands = Map.fromList [
                                           nodeEdgeStyle = valStrOpts "nodeedgestyle" "solid" opts,
                                           leafEdgeStyle = valStrOpts "leafedgestyle" "dashed" opts
                                          }
+         let depfile = valStrOpts "file" "" opts
+         mlab <- case depfile of
+           "" -> return Nothing
+           _  -> (Just . getDepLabels . lines) `fmap` restricted (readFile depfile)
+
          let grph = if null es 
                       then []
-                      else graphvizParseTree pgf lang gvOptions (head es)
+                      else graphvizParseTreeDep mlab pgf lang gvOptions (head es)
          if isFlag "view" opts || isFlag "format" opts then do
            let file s = "_grph." ++ s
            let view = optViewGraph opts
@@ -619,11 +624,13 @@ pgfCommands = Map.fromList [
           else return $ fromString grph,
      examples = [
        mkEx "p \"John walks\" | vp  -- generate a tree and show parse tree as .dot script",
-       mkEx "gr | vp -view=\"open\" -- generate a tree and display parse tree on a Mac"
+       mkEx "gr | vp -view=open -- generate a tree and display parse tree on a Mac",
+       mkEx "p \"she loves us\" | vp -view=open -deps -file=uddeps.labels -nocat"  -- show a visual variant of a dependency tree"
        ],
      options = [
        ("showcat","show categories in the tree nodes (default)"),
        ("nocat","don't show categories"),
+       ("deps","show dependency labels"),
        ("showfun","show function names in the tree nodes"),
        ("nofun","don't show function names (default)"),
        ("showleaves","show the leaves of the tree (default)"),
@@ -631,6 +638,7 @@ pgfCommands = Map.fromList [
        ],
      flags = [
        ("lang","the language to visualize"),
+       ("file","configuration file for dependency labels with -deps, format per line 'fun label*'"),
        ("format","format of the visualization file (default \"png\")"),
        ("view","program to open the resulting file (default \"open\")"),
        ("nodefont","font for tree nodes (default: Times -- graphviz standard font)"),
-- 
cgit v1.2.3