Merge branch master (Spot 1.2.5) into next.

* src/bin/dstar2tgba.cc, src/bin/ltlcross.cc, src/bin/randltl.cc,
src/ltltest/reduccmp.test, src/neverparse/neverclaimparse.yy,
src/tgbatest/ltl2ta.test, src/tgbatest/ltl2tgba.cc,
src/tgbatest/ltlcross.test, src/tgbatest/neverclaimread.test,
wrap/python/ajax/ltl2tgba.html: Fix conflicts.

src/tgbaalgos/hoaf.hh

@@ -0,0 +1,67 @@
+// -*- coding: utf-8 -*-
+// Copyright (C) 2014 Laboratoire de Recherche et Développement de
+// l'Epita (LRDE).
+//
+// This file is part of Spot, a model checking library.
+//
+// Spot is free software; you can redistribute it and/or modify it
+// under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 3 of the License, or
+// (at your option) any later version.
+//
+// Spot is distributed in the hope that it will be useful, but WITHOUT
+// ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+// or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public
+// License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+#ifndef SPOT_TGBAALGOS_HOAF_HH
+# define SPOT_TGBAALGOS_HOAF_HH
+
+#include <iosfwd>
+#include "ltlast/formula.hh"
+#include "tgba/fwd.hh"
+
+namespace spot
+{
+  class tgba;
+  enum hoaf_alias { Hoaf_Alias_None, Hoaf_Alias_Ap, Hoaf_Alias_Cond };
+  enum hoaf_acceptance
+    {
+      Hoaf_Acceptance_States,	/// state-based acceptance if
+				/// (globally) possible
+				/// transition-based acceptance
+				/// otherwise.
+      Hoaf_Acceptance_Transitions, /// transition-based acceptance globally
+      Hoaf_Acceptance_Mixed  /// mix state-based and transition-based
+    };
+
+  /// \ingroup tgba_io
+  /// \brief Print reachable states in Hanoi Omega Automata format.
+  ///
+  /// \param os The output stream to print on.
+  /// \param g The automaton to output.
+  /// \param f The (optional) formula associated to the automaton.  If given
+  ///          it will be output as a comment.
+  /// \parama acceptance Force the type of acceptance mode used
+  ///         in output.
+  /// \param alias Whether aliases should be used in output.
+  /// \param newslines Whether to use newlines in output.
+  SPOT_API std::ostream&
+  hoaf_reachable(std::ostream& os,
+		 const const_tgba_ptr& g,
+		 const ltl::formula* f = 0,
+		 hoaf_acceptance acceptance = Hoaf_Acceptance_States,
+		 hoaf_alias alias = Hoaf_Alias_None,
+		 bool newlines = true);
+
+  SPOT_API std::ostream&
+  hoaf_reachable(std::ostream& os,
+		 const const_tgba_ptr& g,
+		 const char* opt,
+		 const ltl::formula* f = 0);
+}
+
+#endif // SPOT_TGBAALGOS_HOAF_HH