diff --git a/doc/html/documentation_tools_flac.html b/doc/html/documentation_tools_flac.html
index 9f85a259..0964cd2c 100644
--- a/doc/html/documentation_tools_flac.html
+++ b/doc/html/documentation_tools_flac.html
@@ -798,7 +798,7 @@
-6, --compression-level-6
- Synonymous with -l 8 -b 4096 -m -r 6
+ Synonymous with -l 8 -b 4096 -m -r 6 -A tukey(0.5);partial_tukey(2)
|
@@ -807,7 +807,7 @@
-7, --compression-level-7
- Synonymous with -l 8 -b 4096 -m -e -r 6
+ Synonymous with -l 12 -b 4096 -m -r 6 -A tukey(0.5);partial_tukey(2)
|
@@ -816,7 +816,7 @@
-8, --compression-level-8
- Synonymous with -l 12 -b 4096 -m -e -r 6
+ Synonymous with -l 12 -b 4096 -m -r 6 -A tukey(0.5);partial_tukey(2);punchout_tukey(3)
|
diff --git a/include/FLAC/stream_encoder.h b/include/FLAC/stream_encoder.h
index dbfee63b..8a9b1b7e 100644
--- a/include/FLAC/stream_encoder.h
+++ b/include/FLAC/stream_encoder.h
@@ -830,28 +830,28 @@ FLAC_API FLAC__bool FLAC__stream_encoder_set_sample_rate(FLAC__StreamEncoder *en
* The actual values set for each level are:
*
*
- * level |
- * | do mid-side stereo |
- * | loose mid-side stereo |
- * | apodization |
- * | max lpc order |
- * | qlp coeff precision |
- * | qlp coeff prec search |
- * | escape coding |
- * | exhaustive model search |
- * | min residual partition order |
- * | max residual partition order |
- * | rice parameter search dist |
+ * | level |
+ * do mid-side stereo |
+ * loose mid-side stereo |
+ * apodization |
+ * max lpc order |
+ * qlp coeff precision |
+ * qlp coeff prec search |
+ * escape coding |
+ * exhaustive model search |
+ * min residual partition order |
+ * max residual partition order |
+ * rice parameter search dist |
*
- * 0 | | false | | false | | tukey(0.5) | | 0 | | 0 | | false | | false | | false | | 0 | | 3 | | 0 | |
- * 1 | | true | | true | | tukey(0.5) | | 0 | | 0 | | false | | false | | false | | 0 | | 3 | | 0 | |
- * 2 | | true | | false | | tukey(0.5) | | 0 | | 0 | | false | | false | | false | | 0 | | 3 | | 0 | |
- * 3 | | false | | false | | tukey(0.5) | | 6 | | 0 | | false | | false | | false | | 0 | | 4 | | 0 | |
- * 4 | | true | | true | | tukey(0.5) | | 8 | | 0 | | false | | false | | false | | 0 | | 4 | | 0 | |
- * 5 | | true | | false | | tukey(0.5) | | 8 | | 0 | | false | | false | | false | | 0 | | 5 | | 0 | |
- * 6 | | true | | false | | tukey(0.5) | | 8 | | 0 | | false | | false | | false | | 0 | | 6 | | 0 | |
- * 7 | | true | | false | | tukey(0.5) | | 8 | | 0 | | false | | false | | true | | 0 | | 6 | | 0 | |
- * 8 | | true | | false | | tukey(0.5) | | 12 | | 0 | | false | | false | | true | | 0 | | 6 | | 0 | |
+ * 0 | false | false | tukey(0.5) | | 0 | 0 | false | false | false | 0 | 3 | 0 |
+ * 1 | true | true | tukey(0.5) | | 0 | 0 | false | false | false | 0 | 3 | 0 |
+ * 2 | true | false | tukey(0.5) | | 0 | 0 | false | false | false | 0 | 3 | 0 |
+ * 3 | false | false | tukey(0.5) | | 6 | 0 | false | false | false | 0 | 4 | 0 |
+ * 4 | true | true | tukey(0.5) | | 8 | 0 | false | false | false | 0 | 4 | 0 |
+ * 5 | true | false | tukey(0.5) | | 8 | 0 | false | false | false | 0 | 5 | 0 |
+ * 6 | true | false | tukey(0.5);partial_tukey(2) | | 8 | 0 | false | false | false | 0 | 6 | 0 |
+ * 7 | true | false | tukey(0.5);partial_tukey(2) | | 12 | 0 | false | false | false | 0 | 6 | 0 |
+ * 8 | true | false | tukey(0.5);partial_tukey(2);punchout_tukey(3) | 12 | 0 | false | false | false | 0 | 6 | 0 |
*
*
* \default \c 5
diff --git a/src/flac/main.c b/src/flac/main.c
index 2eb86437..44894acf 100644
--- a/src/flac/main.c
+++ b/src/flac/main.c
@@ -1274,8 +1274,8 @@ void show_help(void)
printf(" -4, --compression-level-4 Synonymous with -l 8 -b 4096 -M -r 4\n");
printf(" -5, --compression-level-5 Synonymous with -l 8 -b 4096 -m -r 5\n");
printf(" -6, --compression-level-6 Synonymous with -l 8 -b 4096 -m -r 6\n");
- printf(" -7, --compression-level-7 Synonymous with -l 8 -b 4096 -m -e -r 6\n");
- printf(" -8, --compression-level-8, --best Synonymous with -l 12 -b 4096 -m -e -r 6\n");
+ printf(" -7, --compression-level-7 Synonymous with -l 12 -b 4096 -m -r 6\n");
+ printf(" -8, --compression-level-8, --best Synonymous with -l 12 -b 4096 -m -r 6\n");
printf(" -b, --blocksize=# Specify blocksize in samples\n");
printf(" -m, --mid-side Try mid-side coding for each frame\n");
printf(" -M, --adaptive-mid-side Adaptive mid-side coding for all frames\n");
@@ -1577,8 +1577,8 @@ void show_explain(void)
printf(" -5, --compression-level-5 Synonymous with -l 8 -b 4096 -m -r 5\n");
printf(" -5 is the default setting\n");
printf(" -6, --compression-level-6 Synonymous with -l 8 -b 4096 -m -r 6\n");
- printf(" -7, --compression-level-7 Synonymous with -l 8 -b 4096 -m -e -r 6\n");
- printf(" -8, --compression-level-8, --best Synonymous with -l 12 -b 4096 -m -e -r 6\n");
+ printf(" -7, --compression-level-7 Synonymous with -l 12 -b 4096 -m -r 6\n");
+ printf(" -8, --compression-level-8, --best Synonymous with -l 12 -b 4096 -m -r 6\n");
printf(" -m, --mid-side Try mid-side coding for each frame\n");
printf(" (stereo only)\n");
printf(" -M, --adaptive-mid-side Adaptive mid-side coding for all frames\n");
@@ -1589,12 +1589,12 @@ void show_explain(void)
printf(" blackman, blackman_harris_4term_92db,\n");
printf(" connes, flattop, gauss(STDDEV), hamming,\n");
printf(" hann, kaiser_bessel, nuttall, rectangle,\n");
- printf(" triangle, tukey(P), welch. More than one\n");
- printf(" may be specified but encoding time is a\n");
- printf(" multiple of the number of functions since\n");
- printf(" they are each tried in turn. The encoder\n");
- printf(" chooses suitable defaults in the absence\n");
- printf(" of any -A options.\n");
+ printf(" triangle, tukey(P), welch, partial_tukey(n),\n");
+ printf(" punchout_tukey(n). More than one may be\n");
+ printf(" specified but encoding time is a multiple of\n");
+ printf(" the number of functions since they are each\n");
+ printf(" tried in turn. The encoder chooses suitable\n");
+ printf(" defaults in the absence of any -A options.\n");
printf(" -l, --max-lpc-order=# Max LPC order; 0 => only fixed predictors.\n");
printf(" Must be <= 12 for Subset streams if sample\n");
printf(" rate is <=48kHz.\n");