From b242122ce803fe3f628587ef924f6f897bd602df Mon Sep 17 00:00:00 2001
From: Alexandre Duret-Lutz <adl@lrde.epita.fr>
Date: Wed, 30 Aug 2017 15:08:53 +0200
Subject: [PATCH] dot: add option 'A' to disable 'a'

This way in 2.5 we can make 'a' the default, and tell people to use
SPOT_DOTDEFAULT=A if they want the old behavior in both 2.4 and 2.5.

* spot/twaalgos/dot.cc: Implement the option.
* NEWS, bin/common_aoutput.cc: Mention it.
* tests/core/readsave.test: Test it.
---
 NEWS                     | 2 ++
 bin/common_aoutput.cc    | 9 +++++----
 spot/twaalgos/dot.cc     | 3 +++
 tests/core/readsave.test | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index c9efc427d..fe468f546 100644
--- a/NEWS
+++ b/NEWS
@@ -72,6 +72,8 @@ New in spot 2.3.5.dev (not yet released)
 
   - The print_dot() function will now display names for well known
     acceptance conditions under the formula when option 'a' is used.
+    We plan to enable 'a' by default in a future release, so a new
+    option 'A' has been added to hide the acceptance condition.
 
   - A new named property for automata called "original-states" can be
     used to record the origin of a state before transformation.  It is
diff --git a/bin/common_aoutput.cc b/bin/common_aoutput.cc
index 925a54f1c..e30a41a3b 100644
--- a/bin/common_aoutput.cc
+++ b/bin/common_aoutput.cc
@@ -88,11 +88,12 @@ static const argp_option options[] =
     /**************************************************/
     { nullptr, 0, nullptr, 0, "Output format:", 3 },
     { "dot", 'd',
-      "1|a|b|B|c|C(COLOR)|e|f(FONT)|h|k|n|N|o|r|R|s|t|v|y|+INT|<INT|#",
+      "1|a|A|b|B|c|C(COLOR)|e|f(FONT)|h|k|n|N|o|r|R|s|t|v|y|+INT|<INT|#",
       OPTION_ARG_OPTIONAL,
       "GraphViz's format.  Add letters for "
       "(1) force numbered states, "
-      "(a) display acceptance, "
+      "(a) show acceptance condition, "
+      "(A) hide acceptance condition, "
       "(b) acceptance sets as bullets, "
       "(B) bullets except for Büchi/co-Büchi automata, "
       "(c) force circular nodes, "
@@ -102,8 +103,8 @@ static const argp_option options[] =
       "(f(FONT)) use FONT, "
       "(h) horizontal layout, "
       "(k) use state labels when possible, "
-      "(n) with name, "
-      "(N) without name, "
+      "(n) show name, "
+      "(N) hide name, "
       "(o) ordered transitions, "
       "(r) rainbow colors for acceptance sets, "
       "(R) color acceptance sets by Inf/Fin, "
diff --git a/spot/twaalgos/dot.cc b/spot/twaalgos/dot.cc
index b7e357f6f..d429986d9 100644
--- a/spot/twaalgos/dot.cc
+++ b/spot/twaalgos/dot.cc
@@ -187,6 +187,9 @@ namespace spot
             case 'a':
               opt_show_acc_ = true;
               break;
+            case 'A':
+              opt_show_acc_ = false;
+              break;
             case 'b':
               opt_bullet = true;
               opt_bullet_but_buchi = false;
diff --git a/tests/core/readsave.test b/tests/core/readsave.test
index 6b6548f51..029f62af4 100755
--- a/tests/core/readsave.test
+++ b/tests/core/readsave.test
@@ -314,7 +314,7 @@ EOF
 
 autfilt -H input |
     SPOT_DEFAULT_FORMAT=dot \
-    SPOT_DOTDEFAULT=vcsn \
+    SPOT_DOTDEFAULT=vcsnaA \
     SPOT_DOTEXTRA='/* hello world */' \
     autfilt >output