diff --git a/doc/gf-history.html b/doc/gf-history.html index 9450c8d99..0c913635a 100644 --- a/doc/gf-history.html +++ b/doc/gf-history.html @@ -12,6 +12,29 @@ Changes in functionality since May 17, 2005, release of GF Version 2.2 +

+ +4/3 (AR) Added command use_treebank = ut for lookup in a treebank. +This command can be used as a fast substitute for parsing, but also as a +way to browse treebanks. +

+  ut "He adds this to that" | l -multi   -- use treebank lookup as parser in translation
+  ut -assocs | grep "ComplV2"            -- show all associations with ComplV2
+
+ +

+ +3/3 (AR) Added option -treebank to the i command. This adds treebanks to +the shell state. The possible file formats are +

    +
  1. XML file with a multilingual treebank, produced by tb -xml +
  2. tab-organized text file with a unilingual treebank, produced by ut -assocs +
+Notice that the treebanks in shell state are unilingual, and have strings as keys. +Multilingual treebanks have trees as keys. In case 1, one unilingual treebank per +language is built in the shell state. + +

1/3 (AR) Added option -trees to the command tree_bank = tb. diff --git a/src/GF/Shell/HelpFile.hs b/src/GF/Shell/HelpFile.hs index d89877a3d..ca795d01c 100644 --- a/src/GF/Shell/HelpFile.hs +++ b/src/GF/Shell/HelpFile.hs @@ -245,11 +245,19 @@ txtHelpFile = "\n rf tb.xml | tb -c -- compare-test treebank from file" ++ "\n rf old.xml | tb -trees | tb -xml -- create new treebank from old" ++ "\n" ++ - "\nlt, lookup_treebank: lt String" ++ + "\nut, use_treebank: ut String" ++ "\n Lookup a string in a treebank and return the resulting trees." ++ - "\n Use 'tb' to create a treebank and 'i -treebank' to read it in memory." ++ - "\n flag:" ++ - "\n -treebank use this treebank (instead of the latest introduced one) TODO" ++ + "\n Use 'tb' to create a treebank and 'i -treebank' to read one from" ++ + "\n a file." ++ + "\n options:" ++ + "\n -assocs show all string-trees associations in the treebank" ++ + "\n -strings show all strings in the treebank" ++ + "\n -raw return result as string, without typechecking it" ++ + "\n flags:" ++ + "\n -treebank use this treebank (instead of the latest introduced one)" ++ + "\n examples:" ++ + "\n ut \"He adds this to that\" | l -multi -- use treebank lookup as parser in translation" ++ + "\n ut -assocs | grep \"ComplV2\" -- show all associations with ComplV2" ++ "\n" ++ "\ntt, test_tokenizer: tt String" ++ "\n Show the token list sent to the parser when String is parsed." ++ diff --git a/src/GF/Shell/PShell.hs b/src/GF/Shell/PShell.hs index 2c501ab9f..159910755 100644 --- a/src/GF/Shell/PShell.hs +++ b/src/GF/Shell/PShell.hs @@ -114,7 +114,7 @@ pCommand ws = case ws of "cc" : s -> aUnit $ CComputeConcrete $ unwords s "so" : s -> aUnit $ CShowOpers $ unwords s "tb" : [] -> aUnit CTreeBank - "lt" : s -> aString CLookupTreebank s + "ut" : s -> aString CLookupTreebank s "tq" : i:o:[] -> aUnit (CTranslationQuiz (language i) (language o)) "tl":i:o:[] -> aUnit (CTranslationList (language i) (language o)) diff --git a/src/HelpFile b/src/HelpFile index aff813043..bea9a7b9a 100644 --- a/src/HelpFile +++ b/src/HelpFile @@ -216,11 +216,19 @@ tb, tree_bank: tb rf tb.xml | tb -c -- compare-test treebank from file rf old.xml | tb -trees | tb -xml -- create new treebank from old -lt, lookup_treebank: lt String +ut, use_treebank: ut String Lookup a string in a treebank and return the resulting trees. - Use 'tb' to create a treebank and 'i -treebank' to read it in memory. - flag: - -treebank use this treebank (instead of the latest introduced one) TODO + Use 'tb' to create a treebank and 'i -treebank' to read one from + a file. + options: + -assocs show all string-trees associations in the treebank + -strings show all strings in the treebank + -raw return result as string, without typechecking it + flags: + -treebank use this treebank (instead of the latest introduced one) + examples: + ut "He adds this to that" | l -multi -- use treebank lookup as parser in translation + ut -assocs | grep "ComplV2" -- show all associations with ComplV2 tt, test_tokenizer: tt String Show the token list sent to the parser when String is parsed.