continued

v2/tacutils/taccat.c

@@ -363,6 +363,12 @@ int main(int argc, char **argv)
   }
   /* Sort by sample time, if there was overlap */
   if(isOverlap) tacSortByTime(&tac1, NULL);
+
+  /* Add interfile type header contents that are stored as comments in file 2 */
+  iftCopyItems(&tac1.h, &tac2.h, 1, 1, 2, NULL);
+  /* Remove duplicate header fields */
+  iftDeleteDuplicateKeys(&tac1.h, NULL);
+
   /* No need for the second dataset */
   tacFree(&tac2);
 

v2/tacutils/test/taccat/test_taccat.sh

 #!/bin/bash
 #: Title      : test_taccat
-#: Date       : 2021-02-09
+#: Date       : 2021-02-11
 #: Author     : "Vesa Oikonen" <vesa.oikonen@utu.fi>
 #: Options    : None
 
@@ -158,7 +158,7 @@ rm -f output.tac
 $PROGRAM test1a.tac test1b.tac output.tac
 if [ $? -ne 0 ] ; then printf "\nFailed!\n" ; exit 1 ; fi
 printf "\n ok \n"
-tacmatch -abs=0.1 -rel=1 correct_output1.tac output.tac
+tacmatch -abs=0.1 -rel=1 -xunit=y -yunit=y -tacnames=y correct_output1.tac output.tac
 if [ $? -ne 0 ] ; then printf "\nFailed!\n" ; exit 1 ; fi
 printf "\n ok \n"
 tacweigh -list output.tac
@@ -199,7 +199,7 @@ rm -f output.dft
 $PROGRAM test1a.dft test1b.dft output.dft
 if [ $? -ne 0 ] ; then printf "\nFailed!\n" ; exit 1 ; fi
 printf "\n ok \n"
-tacmatch -abs=0.1 -rel=1 correct_output1.dft output.dft
+tacmatch -abs=0.1 -rel=1 -xunit=y -yunit=y -tacnames=y correct_output1.dft output.dft
 if [ $? -ne 0 ] ; then printf "\nFailed!\n" ; exit 1 ; fi
 printf "\n passed. \n\n"