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/ltltest/rand.test

@@ -97,3 +97,29 @@ c
 EOF
 
 diff expected out2
+
+
+# atomic proposition can be implicitly specified using a number
+$randltl -n 1000 3 --tree-size=10..20 > out
+grep -q p0 out
+grep -q p1 out
+grep -q p2 out
+grep p3 out && exit 1
+
+
+# We should be able to generate exactly two formulas with 0 atomic
+# propositions.
+run 0 $randltl -n2 0 | sort > out
+cat >expected <<EOF
+0
+1
+EOF
+diff out expected
+
+# requesting more formulas should fail
+run 2 $randltl -n3 0
+
+# If more numbers are given, there are interpreted as atomic propositions
+run 0 $randltl -n1000 0 1 > out
+grep -q '"0"' out
+grep -q '"1"' out