[gnuastro-commits] master a8428fe 088/113: Imported recent work in master, conflicts fixed

[Mohammad Akhlaghi]

branch: master
commit a8428fe892b51f93de20ae55932d706f8acd0da2
Merge: d57e0e6 e41a18a
Author: Mohammad Akhlaghi <mohammad@akhlaghi.org>
Commit: Mohammad Akhlaghi <mohammad@akhlaghi.org>

    Imported recent work in master, conflicts fixed
    
    There were a few conflicts regarding the parallel changes in both branches
    (on MakeCatalog's new `--spectrum' feature in this branch, along with the
    updated book text. All these conflicts are fixed with this commit.
---
 NEWS                      |  1 +
 bin/mkcatalog/mkcatalog.c |  1 -
 doc/gnuastro.texi         | 17 ++++++++---------
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/NEWS b/NEWS
index f0761ef..d6191b1 100644
--- a/NEWS
+++ b/NEWS
@@ -92,6 +92,7 @@ GNU Astronomy Utilities NEWS                          -*- 
outline -*-
     --meanmedqdiff: new name for `--modmedqdiff'. Similar to NoiseChisel.
 
   Library:
+    - gal_data_copy_to_allocated: Also copies string metadata (e.g., name).
     - gal_fits_key_write: filename and hdu instead of FITS pointer.
     - gal_fits_key_write_version: filename and hdu instead of FITS pointer.
     - gal_fits_key_write_filename: write at the top or end of the input list.
diff --git a/bin/mkcatalog/mkcatalog.c b/bin/mkcatalog/mkcatalog.c
index 50d6764..4a3efca 100644
--- a/bin/mkcatalog/mkcatalog.c
+++ b/bin/mkcatalog/mkcatalog.c
@@ -730,7 +730,6 @@ mkcatalog_write_outputs(struct mkcatalogparams *p)
             printf("  - Spectra in %zu files with `-spec-NN.txt' suffix.\n",
                    p->numobjects);
         }
-
     }
 }
 
diff --git a/doc/gnuastro.texi b/doc/gnuastro.texi
index ee791da..ec32028 100644
--- a/doc/gnuastro.texi
+++ b/doc/gnuastro.texi
@@ -17639,10 +17639,10 @@ the output catalog/table's central position 
column@footnote{See
 @ref{Measuring elliptical parameters} for a discussion on this and the
 derivation of positional parameters, which includes the
 center.}. Similarly, the sum of all these pixels will be the 42nd row in
-the brightness column and etc. Pixels with labels equal to, or smaller than
-zero will be ignored by MakeCatalog. In other words, the number of rows in
-MakeCatalog's output is already known before running it (the maximum value
-of the labeled dataset).
+the brightness column and etc. Pixels with labels equal to, or smaller
+than, zero will be ignored by MakeCatalog. In other words, the number of
+rows in MakeCatalog's output is already known before running it (the
+maximum value of the labeled dataset).
 
 Before getting into the details of running MakeCatalog (in @ref{Invoking
 astmkcatalog}, we'll start with a discussion on the basics of its approach
@@ -18408,9 +18408,9 @@ options and general setting options are described below.
 @item -l STR
 @itemx --clumpsfile=STR
 The file containing the labeled clumps dataset when @option{--clumpscat} is
-called (see @ref{MakeCatalog output}). When @option{--clumpscat} is
-called, but this option isn't, MakeCatalog will look into the main input
-file (given as an argument) for the required extension/HDU (value to
+called (see @ref{MakeCatalog output}). When @option{--clumpscat} is called,
+but this option isn't, MakeCatalog will look into the main input file
+(given as an argument) for the required extension/HDU (value to
 @option{--clumpshdu}).
 
 @item --clumpshdu=STR
@@ -18637,8 +18637,7 @@ option.
 The final group of options particular to MakeCatalog are those that specify
 which measurements/columns should be written into the final output
 table. The most basic measurement is one which only produces one final
-value for each label (for example its total brightness: a single
-number).
+value for each label (for example its total brightness: a single number).
 
 In this case, all the different label's measurements can be written as one
 column in a final table/catalog that contains other columns for other