Merge from emacs-24; up to 2014-03-21T23:16:26Z!rms@gnu.org

[bpt/emacs.git] / doc / misc / wisent.texi

diff --git a/doc/misc/wisent.texi b/doc/misc/wisent.texi
index e33a50a..3eb5a58 100644 (file)
--- a/doc/misc/wisent.texi
+++ b/doc/misc/wisent.texi
@@ -20,10 +20,11 @@
 @c @footnotestyle separate
 @c @paragraphindent 2
 @c @@smallbook
+@documentencoding UTF-8
 @c %**end of header
 
 @copying
-Copyright @copyright{} 1988--1993, 1995, 1998--2004, 2007, 2012--2013
+Copyright @copyright{} 1988--1993, 1995, 1998--2004, 2007, 2012--2014
 Free Software Foundation, Inc.
 
 @c Since we are both GNU manuals, we do not need to ack each other here.
@@ -130,10 +131,11 @@ June 1985, Report No. UCB/CSD 85/251.
 
 @item
 For generating the lookahead sets, Wisent uses the well-known
-technique of F. DeRemer and A. Pennello they described in:
+technique of F. DeRemer and T. Pennello described in:
 @quotation
-@cite{Efficient Construction of LALR(1) Lookahead Sets}@*
-October 1982, ACM TOPLS Vol 4 No 4.
+@cite{Efficient Computation of LALR(1) Look-Ahead Sets}@*
+October 1982, ACM TOPLAS Vol 4 No 4, 615--49,
+@uref{http://dx.doi.org/10.1145/69622.357187}.
 @end quotation
 
 @item
@@ -221,8 +223,7 @@ in between, can be combined into a larger grouping of type @samp{exp}.
 * Conflicts::
 @end menu
 
-@node Grammar format, Example, Wisent Grammar, Wisent Grammar
-@comment  node-name,  next,  previous,  up
+@node Grammar format
 @section Grammar format
 
 @cindex grammar format
@@ -280,7 +281,7 @@ For example,
 
 Says that two groupings of type @samp{exp}, with a @samp{+} token in
 between, can be combined into a larger grouping of type @samp{exp}.
- 
+
 @cindex grammar coding conventions
 By convention, a nonterminal symbol should be in lower case, such as
 @samp{exp}, @samp{stmt} or @samp{declaration}.  Terminal symbols
@@ -440,8 +441,7 @@ matching the empty string, for which the default action is to return
 @end table
 @end table
 
-@node Example, Compiling a grammar, Grammar format, Wisent Grammar
-@comment  node-name,  next,  previous,  up
+@node Example
 @section Example
 
 @cindex grammar example
@@ -556,8 +556,7 @@ exp:
 @end group
 @end example
 
-@node Compiling a grammar, Conflicts, Example, Wisent Grammar
-@comment  node-name,  next,  previous,  up
+@node Compiling a grammar
 @section Compiling a grammar
 
 @cindex automaton
@@ -615,8 +614,7 @@ an Emacs Lisp function (lambda expression).
 @end table
 @end defun
 
-@node Conflicts, , Compiling a grammar, Wisent Grammar
-@comment  node-name,  next,  previous,  up
+@node Conflicts
 @section Conflicts
 
 Normally, a grammar should produce an automaton where at each state
@@ -691,7 +689,7 @@ Toggle whether to report verbose information on generated parser.
 @end deffn
 
 The verbose report is printed in the temporary buffer
-@code{*wisent-log*} when running interactively, or in file
+@file{*wisent-log*} when running interactively, or in file
 @file{wisent.output} when running in batch mode.  Different
 reports are separated from each other by a line like this:
 
@@ -762,7 +760,7 @@ Grammar contains 7 shift/reduce conflicts
 @end group
 @end example
 
-The @samp{*wisent-log*} buffer details things!
+The @file{*wisent-log*} buffer details things!
 
 The first section reports conflicts that were solved using precedence
 and/or associativity:
@@ -1211,7 +1209,7 @@ data type.
 
 @item start
 @itemx end
-Are the optionals beginning and end positions of @var{value} in the
+Are the optional beginning and ending positions of @var{value} in the
 input stream.
 @end table
 
@@ -1334,8 +1332,8 @@ of the current statement if an error is detected:
 
 @example
 @group
-(stmnt (( error ?; )) ;; on error, skip until ';' is read
-       )
+(statement (( error ?; )) ;; on error, skip until ';' is read
+           )
 @end group
 @end example
 
@@ -1603,7 +1601,7 @@ it can be worth a mix of the two styles!
 * Useful functions::
 @end menu
 
-@node Iterative style, Bison style, Grammar styles, Grammar styles
+@node Iterative style
 @subsection Iterative style
 
 @cindex grammar iterative style