Change specification of -EFns=? option (for 16-bit)

diff --git a/doc/C/timidity.1 b/doc/C/timidity.1
index ebfa50c..d39fae2 100644 (file)
--- a/doc/C/timidity.1
+++ b/doc/C/timidity.1
@@ -376,19 +376,19 @@ Default value is \fB4\fP.
 .RS
 .TP
 .B 0
-no noise shaping
+No noise shaping.
 .TP
 .B 1
-traditional noise shaping
+Traditional noise shaping.
 .TP
 .B 2
-overdrive-like soft-clipping + new noise shaping
+Overdrive-like soft-clipping + new noise shaping.
 .TP
 .B 3
-tube-amplifier-like soft-clipping + new noise shaping
+Tube-amplifier-like soft-clipping + new noise shaping.
 .TP
 .B 4
-new noise shaping
+New noise shaping.
 .RE
 .TP
 .BI "resamp=, \-\-resample " (d|l|c|L|n|g)

diff --git a/doc/ja_JP.eucJP/timidity.1 b/doc/ja_JP.eucJP/timidity.1
index 60ac3d6..7d80597 100644 (file)
--- a/doc/ja_JP.eucJP/timidity.1
+++ b/doc/ja_JP.eucJP/timidity.1
@@ -400,10 +400,10 @@ Moog 
 ½¾Íè¤Î¥Î¥¤¥º¥·¥§¡¼¥Ô¥ó¥°
 .TP
 .B 2
-Overdrive É÷¥½¥Õ¥È¥¯¥ê¥Ã¥Ô¥ó¥° + ¿·¥Î¥¤¥º¥·¥§¡¼¥Ô¥ó¥°
+²áÉé²ÙÉ÷¥½¥Õ¥È¥¯¥ê¥Ã¥Ô¥ó¥° + ¿·¥Î¥¤¥º¥·¥§¡¼¥Ô¥ó¥°
 .TP
 .B 3
-Tube Amplifier É÷¥½¥Õ¥È¥¯¥ê¥Ã¥Ô¥ó¥° + ¿·¥Î¥¤¥º¥·¥§¡¼¥Ô¥ó¥°
+¿¿¶õ´ÉÉ÷¥½¥Õ¥È¥¯¥ê¥Ã¥Ô¥ó¥° + ¿·¥Î¥¤¥º¥·¥§¡¼¥Ô¥ó¥°
 .TP
 .B 4
 ¿·¥Î¥¤¥º¥·¥§¡¼¥Ô¥ó¥°
@@ -477,7 +477,7 @@ X Window System 
 .ns
 .TP
 .BI "\-\-sequencer\-ports " n
-¥æ¡¼¥¶¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹¤ò»ØÄꤷ¤Þ¤¹¡£´Ä¶­¤Ë¤è¤Ã¤ÆÍøÍѲÄǽ¤Ê¥¤¥ó¥¿¥Õ¥§¡¼
+¥æ¡¼¥¶¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤ò»ØÄꤷ¤Þ¤¹¡£´Ä¶­¤Ë¤è¤Ã¤ÆÍøÍѲÄǽ¤Ê¥¤¥ó¥¿¥Õ¥§¡¼
 ¥¹¤¬°Û¤Ê¤ê¤Þ¤¹¡£
 .br
 ALSA ¥·¡¼¥±¥ó¥µ¥¤¥ó¥¿¥Õ¥§¡¼¥¹¤Ç¤Ï¡¤ÊÌÅÓ \fB\-\-realtime\-priority\fP
@@ -533,13 +533,13 @@ ALSA 
 Windows ¥·¥ó¥»¥µ¥¤¥¶¥¤¥ó¥¿¥Õ¥§¡¼¥¹
 .TP
 .B \-iw
-Windows GUI ¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹
+Windows GUI ¥¤¥ó¥¿¥Õ¥§¡¼¥¹
 .TP
 .B \-iP
 PortMIDI ¥·¥ó¥»¥µ¥¤¥¶¥¤¥ó¥¿¥Õ¥§¡¼¥¹
 .TP
 .B \-ip
-UMP ¥¤¥ó¥¿¡¼¥Õ¥§¡¼¥¹
+UMP ¥¤¥ó¥¿¥Õ¥§¡¼¥¹
 .TP
 .B ¥¤¥ó¥¿¥Õ¥§¡¼¥¹¥ª¥×¥·¥ç¥ó
 ¾åµ­¥ª¥×¥·¥ç¥ó¤Ë³¤±¤Æ¡¤°Ê²¼¤Îʸ»úÎó¤òÄɲ乤뤳¤È¤¬¤Ç¤­¤Þ¤¹(Ê£¿ô»ØÄê²½)¡£

diff --git a/timidity/timidity.c b/timidity/timidity.c
index 2fea88d..dad087a 100644 (file)
--- a/timidity/timidity.c
+++ b/timidity/timidity.c
@@ -3307,7 +3307,7 @@ __attribute__((noreturn))
 static inline int parse_opt_h(const char *arg)
 {
        static char *help_list[] = {
-"TiMidity++ version %s (C) 1999-2003 Masanao Izumo <mo@goice.co.jp>",
+"TiMidity++ version %s (C) 1999-2004 Masanao Izumo <iz@onicos.co.jp>",
 "The original version (C) 1995 Tuukka Toivonen <tt@cgs.fi>",
 "TiMidity is free software and comes with ABSOLUTELY NO WARRANTY.",
 "",
@@ -4302,7 +4302,7 @@ static inline int parse_opt_v(const char *arg)
        const char *version_list[] = {
                "TiMidity++ version ", timidity_version, NLS,
                NLS,
-               "Copyright (C) 1999-2003 Masanao Izumo <mo@goice.co.jp>", NLS,
+               "Copyright (C) 1999-2004 Masanao Izumo <iz@onicos.co.jp>", NLS,
                "Copyright (C) 1995 Tuukka Toivonen <tt@cgs.fi>", NLS,
                NLS,
 #ifdef __W32__
@@ -4557,7 +4557,7 @@ static void interesting_message(void)
 {
        printf(
 "TiMidity++ version %s -- MIDI to WAVE converter and player" NLS
-"Copyright (C) 1999-2003 Masanao Izumo <mo@goice.co.jp>" NLS
+"Copyright (C) 1999-2004 Masanao Izumo <iz@onicos.co.jp>" NLS
 "Copyright (C) 1995 Tuukka Toivonen <tt@cgs.fi>" NLS
                        NLS
 #ifdef __W32__
@@ -4577,7 +4577,7 @@ static void interesting_message(void)
                        NLS
 "You should have received a copy of the GNU General Public License" NLS
 "along with this program; if not, write to the Free Software" NLS
-"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA" NLS
+"Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA" NLS
                        NLS, timidity_version);
 }