[gnuastro-commits] master 83be6bae: Table: short format of --txtf64format to -A (due to conflict)

[Mohammad Akhlaghi]

branch: master
commit 83be6bae7127fc8ce00537cbe256743f2bd1573d
Author: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Commit: Mohammad Akhlaghi <mohammad@akhlaghi.org>

    Table: short format of --txtf64format to -A (due to conflict)
    
    Until now, the short format of the '--txtf64format' option was
    '-d'. However, this was the same as the short format for the '--descending'
    option and this caused a conflict when '--decensing' was used.
    
    With this commit, the short format '-A' has been set for '--txtf64format'
    and this fixed the problem.
    
    This bug was reproted by Giulia Golini.
    
    This fixes bug #63270.
---
 NEWS                         | 7 +++++++
 bin/table/args.h             | 2 +-
 bin/table/ui.h               | 4 ++--
 doc/announce-acknowledge.txt | 1 +
 doc/gnuastro.texi            | 2 +-
 5 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/NEWS b/NEWS
index 6e8bb953..f78d62c2 100644
--- a/NEWS
+++ b/NEWS
@@ -12,11 +12,18 @@ See the end of the file for license conditions.
 
 ** Changed features
 
+  Table:
+  -A: new short format for --txtf64format. The '-d' short format was
+   conflicting with the short option name for '--descending'.
+
 ** Bugs fixed
   bug #63266: Table ignores a value of 0 given to '--txtf32precision' or
               '--txtf32precision=0' (happens when floating point columns
               need to be rounded to integers). Reported by Sepideh
               Eskandarlou.
+  bug #63270: Table aborts when called with '--descending' with complaint
+              on '--txtf64format' (that was added in Gnuastro
+              0.19). Reported by Giulia Golini.
 
 
 
diff --git a/bin/table/args.h b/bin/table/args.h
index f1c1b3e8..0b8e48c8 100644
--- a/bin/table/args.h
+++ b/bin/table/args.h
@@ -238,7 +238,7 @@ struct argp_option program_options[] =
       UI_KEY_TXTF64PRECISION,
       "INT",
       0,
-      "Text output float32 precision.",
+      "Text output float64 precision.",
       GAL_OPTIONS_GROUP_OUTPUT,
       &p->txtf64precision,
       GAL_TYPE_INT,
diff --git a/bin/table/ui.h b/bin/table/ui.h
index 9869f027..5c273b61 100644
--- a/bin/table/ui.h
+++ b/bin/table/ui.h
@@ -42,7 +42,7 @@ enum program_args_groups
 /* Available letters for short options:
 
    a g j k l t v x y z
-   A G J Q Y
+   G J Q Y
 */
 enum option_keys_enum
 {
@@ -68,7 +68,7 @@ enum option_keys_enum
   UI_KEY_CATROWHDU       = 'X',
   UI_KEY_COLMETADATA     = 'm',
   UI_KEY_TXTF32FORMAT    = 'f',
-  UI_KEY_TXTF64FORMAT    = 'd',
+  UI_KEY_TXTF64FORMAT    = 'A',
   UI_KEY_TXTF32PRECISION = 'p',
   UI_KEY_TXTF64PRECISION = 'B',
 
diff --git a/doc/announce-acknowledge.txt b/doc/announce-acknowledge.txt
index 52ec6350..991973ad 100644
--- a/doc/announce-acknowledge.txt
+++ b/doc/announce-acknowledge.txt
@@ -1,6 +1,7 @@
 Alphabetically ordered list to acknowledge in the next release.
 
 Sepideh Eskandarlou
+Giulia Golini
 Michael Stein
 
 
diff --git a/doc/gnuastro.texi b/doc/gnuastro.texi
index aa32e93e..76fdbf3b 100644
--- a/doc/gnuastro.texi
+++ b/doc/gnuastro.texi
@@ -14870,7 +14870,7 @@ Number of digits after the decimal point (precision) 
for columns with a 32-bit f
 This can take any positive integer (including 0).
 When given a value of zero, the floating point number will be rounded to the 
nearest integer.
 
-@item  -d STR
+@item  -A STR
 @itemx --txtf64format=STR
 The plain-text format of 64-bit floating point columns when output is not 
binary (this option is ignored for binary outputs like FITS tables).
 The acceptable values are listed below.