prefer structure Keyword and Parse;

--- a/doc-src/antiquote_setup.ML	Tue May 18 00:01:51 2010 +0200
+++ b/doc-src/antiquote_setup.ML	Tue May 18 10:13:33 2010 +0200
@@ -166,9 +166,9 @@
 in
 
 val _ = entity_antiqs no_check "" "syntax";
-val _ = entity_antiqs (K (is_some o OuterKeyword.command_keyword)) "isacommand" "command";
-val _ = entity_antiqs (K OuterKeyword.is_keyword) "isakeyword" "keyword";
-val _ = entity_antiqs (K OuterKeyword.is_keyword) "isakeyword" "element";
+val _ = entity_antiqs (K (is_some o Keyword.command_keyword)) "isacommand" "command";
+val _ = entity_antiqs (K Keyword.is_keyword) "isakeyword" "keyword";
+val _ = entity_antiqs (K Keyword.is_keyword) "isakeyword" "element";
 val _ = entity_antiqs (thy_check Method.intern Method.defined) "" "method";
 val _ = entity_antiqs (thy_check Attrib.intern Attrib.defined) "" "attribute";
 val _ = entity_antiqs no_check "" "fact";

--- a/doc-src/rail.ML	Tue May 18 00:01:51 2010 +0200
+++ b/doc-src/rail.ML	Tue May 18 10:13:33 2010 +0200
@@ -59,9 +59,9 @@
 (*  [(kind, (markup, check, style))*)
   Symtab.make [
   ("syntax", ("", no_check, true)),
-  ("command", ("isacommand", K (is_some o OuterKeyword.command_keyword), true)),
-  ("keyword", ("isakeyword", K OuterKeyword.is_keyword, true)),
-  ("element", ("isakeyword", K OuterKeyword.is_keyword, true)),
+  ("command", ("isacommand", K (is_some o Keyword.command_keyword), true)),
+  ("keyword", ("isakeyword", K Keyword.is_keyword, true)),
+  ("element", ("isakeyword", K Keyword.is_keyword, true)),
   ("method", ("", thy_check Method.intern Method.defined, true)),
   ("attribute", ("", thy_check Attrib.intern Attrib.defined, true)),
   ("fact", ("", no_check, true)),
@@ -473,7 +473,7 @@
   |> parse
   |> print;
 
-val _ = ThyOutput.antiquotation "rail" (Scan.lift ( OuterParse.position Args.name ))
+val _ = ThyOutput.antiquotation "rail" (Scan.lift (Parse.position Args.name))
   (fn {context = ctxt,...} => fn txt => process txt ctxt);
 
 end;