Merge remote-tracking branch 'origin/maint'

* origin/maint:
  tests: close files in glr-regression
  xml: match DOT output and xml2dot.xsl processing
  xml: factor xslt space template
  graph: fix a memory leak
  xml: documentation
  output: capitalize State

diff --cc NEWS
Simple merge

diff --cc doc/bison.texi
Simple merge

diff --cc src/print.c
Simple merge

diff --cc src/print_graph.c
index 918a3df8937e94686c5f9d4efb3b90a90896d538,f4742b165876ccfe9fc45cd9136b0b7456337006..31e0e382d5378450d974ae7013bdfa3a85b5c521
--- 1/src/print_graph.c
--- 2/src/print_graph.c
+++ b/src/print_graph.c
@@@ -152,22 -148,24 +149,24 @@@ print_actions (state const *s, FILE *fg
    for (i = 0; i < trans->num; i++)
      if (!TRANSITION_IS_DISABLED (trans, i))
        {
 -      state *s1 = trans->states[i];
 -      symbol_number sym = s1->accessing_symbol;
 -
 -      /* Shifts are solid, gotos are dashed, and error is dotted.  */
 -      char const *style =
 -        (TRANSITION_IS_ERROR (trans, i) ? "dotted"
 -         : TRANSITION_IS_SHIFT (trans, i) ? "solid"
 -         : "dashed");
 -
 -      if (TRANSITION_IS_ERROR (trans, i)
 -          && strcmp (symbols[sym]->tag, "error") != 0)
 -        abort ();
 -      output_edge (s->number, s1->number,
 -                   TRANSITION_IS_ERROR (trans, i) ? NULL : symbols[sym]->tag,
 -                   style, fgraph);
 +        state *s1 = trans->states[i];
 +        symbol_number sym = s1->accessing_symbol;
 +
 +        /* Shifts are solid, gotos are dashed, and error is dotted.  */
 +        char const *style =
 +          (TRANSITION_IS_ERROR (trans, i) ? "dotted"
 +           : TRANSITION_IS_SHIFT (trans, i) ? "solid"
 +           : "dashed");
 +
 +        if (TRANSITION_IS_ERROR (trans, i)
 +            && STRNEQ (symbols[sym]->tag, "error"))
 +          abort ();
 +        output_edge (s->number, s1->number,
 +                     TRANSITION_IS_ERROR (trans, i) ? NULL : symbols[sym]->tag,
 +                     style, fgraph);
        }
+   /* Display reductions. */
+   output_red (s, s->reductions, fgraph);
  }
  
  

diff --cc tests/conflicts.at
Simple merge

diff --cc tests/existing.at
Simple merge

diff --cc tests/glr-regression.at
Simple merge

diff --cc tests/local.at
Simple merge

diff --cc tests/output.at
Simple merge

diff --cc tests/reduce.at
Simple merge

diff --cc tests/regression.at
Simple merge