[gnuastro-commits] master 8bd789c: Updated Acknowledgement statement

[Mohammad Akhlaghi]

branch: master
commit 8bd789c964bd637d45d8283b0e3ebb28934d88ab
Author: Mohammad Akhlaghi <address@hidden>
Commit: Mohammad Akhlaghi <address@hidden>

    Updated Acknowledgement statement
    
    Since I have now moved to the IAC with a different funding source, the
    acknowledgement statement that is output with `--cite' has now been
    improved to include the new sources. The added statement was provided by
    Johan Knapen.
    
    Also, I noticed that my old Japanese funding was not completely mentioned
    (full name of ministry, and funding grant numbers), so that has also been
    corrected.
---
 NEWS          |  1 +
 THANKS        |  1 +
 lib/options.c | 16 ++++++++++------
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/NEWS b/NEWS
index 1d59fe6..82d39da 100644
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,7 @@ GNU Astronomy Utilities NEWS                          -*- 
outline -*-
    - Standard input (for example from pipes) is now available to feed input
      to all programs that accept plain text input (ConvertType, Match,
      MakeProfiles, Statistics, Table).
+   - Updated acknowledgement statement (output of `--cite' option).
 
   Arithmetic:
     --onedasimage: write output as an image if it has one dimension, not table.
diff --git a/THANKS b/THANKS
index 6a6ea2a..a0b6ef3 100644
--- a/THANKS
+++ b/THANKS
@@ -41,6 +41,7 @@ support in Gnuastro. The list is ordered alphabetically (by 
family name).
     Lee Kelvin                           address@hidden
     Brandon Kelly                        address@hidden
     Mohammad-Reza Khellat                address@hidden
+    Johan Knapen                         address@hidden
     Geoffry Krouchi                      address@hidden
     Floriane Leclercq                    address@hidden
     Alan Lefor                           address@hidden
diff --git a/lib/options.c b/lib/options.c
index 9646062..7b2f3a0 100644
--- a/lib/options.c
+++ b/lib/options.c
@@ -297,12 +297,16 @@ gal_options_print_citation(struct argp_option *option, 
char *arg,
                "Acknowledgement\n"
                "---------------\n"
                "This work was partly done using GNU Astronomy Utilities "
-               "(Gnuastro, ascl.net/1801.009) version %s. Gnuastro is a "
-               "generic package for astronomical data manipulation and "
-               "analysis which was initially created and developed for "
-               "research funded by the Monbukagakusho (Japanese "
-               "government) scholarship and European Research Council "
-               "(ERC) advanced grant 339659-MUSICOS.", PACKAGE_VERSION)<0 )
+               "(Gnuastro, ascl.net/1801.009) version %s. Work on Gnuastro "
+               "has been funded by the Japanese Ministry of Education, "
+               "Culture, Sports, Science, and Technology (MEXT) scholarship "
+               "and its Grant-in-Aid for Scientific Research (21244012, "
+               "24253003), the European Research Council (ERC) advanced "
+               "grant 339659-MUSICOS, European Union’s Horizon 2020 research "
+               "and innovation programme under Marie Sklodowska-Curie grant "
+               "agreement No 721463 to the SUNDIAL ITN, and from the Spanish "
+               "Ministry of Economy and Competitiveness (MINECO) under grant "
+               "number AYA2016-76219-P. ", PACKAGE_VERSION)<0 )
     error(EXIT_FAILURE, 0, "%s: asprintf allocation", __func__);
   printf("%s\n", gnuastro_acknowledgement);
   free(gnuastro_acknowledgement);