オプションの説明の調整

・「編集入出力→タグ入出力」など・-Dオプションの説明を刷新・英語の「エラーを返す」表現など
hcmiya · May 28, 2019 · 3355c46 · 3355c46
1 parent 4ff1357
commit 3355c46
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 37 deletions.
diff --git a/nls/C/6.usage b/nls/C/6.usage
@@ -27,11 +27,11 @@ Options:\n\
     -i idx\n\
           Specify %2$s index for editing in multiplexed Ogg stream\n\
           (1-origin, without non-%2$s stream)\n\
-    -R    Assume editing IO to be encoded in UTF-8\n\
+    -R    Assume tag IO to be encoded in UTF-8\n\
     -e    Use escape sequence; \\\\, \\n, \\r and \\0\n\
-    -0    Use '\\0' separation for editing IO\n\
+    -0    Use '\\0' separation for tag IO\n\
     -t NAME=VALUE\n\
-          add the argument as editing item\n\
+          add the argument as a tag\n\
     -c tagfile\n\
           In list mode, write tags to tagfile.\n\
           In append/write mode, read tags from tagfile\n\
@@ -40,9 +40,12 @@ Options:\n\
           When VALUE is omitted, All of NAME is removed. Implies -U\n\
     -p    Supress editing for METADATA_BLOCK_PICTURE\n\
     -U    Convert field name stored in srcfile to uppercase\n\
-    -V    Verify Tags stored in srcfile\n\
-    -T    Error when editing input is not terminated by line feed\n\
-    -D    Defer editing IO; implies -V, -T\n\
+    -V    Verify tags stored in srcfile\n\
+    -T    Return error when tag input is not terminated by line feed\n\
+    -D    In list mode, defer tag output until comment packet is built.\n\
+          Implies -V.\n\
+          In appent/write mode, return error when tag input is empty.\n\
+          Implies -T\n\
 `
 
 $ opus specific options

diff --git a/nls/C@l33t/6.usage b/nls/C@l33t/6.usage
@@ -27,11 +27,11 @@ $ %2$s = codec name, e.g. Opus, Theora, ...
     -i idx\n\
           5p3c1fy %2$s 1nd3x f0r 3d171n6 1n mul71pl3x3d 066 57r34m\n\
           (1-0r161n, w17h0u7 n0n-%2$s 57r34m)\n\
-    -R    455um3 3d171n6 10 70 b3 3nc0d3d 1n u7f-8\n\
+    -R    455um3 746 10 70 b3 3nc0d3d 1n u7f-8\n\
     -e    u53 35c4p3 53qu3nc3; \\\\, \\n, \\r 4nd \\0\n\
-    -0    Use '\\0' separation for editing IO\n\
+    -0    u53 '\\0' 53p4r4710n f0r 746 10\n\
     -t NAME=VALUE\n\
-          4dd 7h3 4r6um3n7 45 3d171n6 173m\n\
+          4dd 7h3 4r6um3n7 45 4 746\n\
     -c tagfile\n\
           1n l157 m0d3, wr173 7465 70 "tagfile".\n\
           1n 4pp3nd/wr173 m0d3, r34d 7465 fr0m "tagfile"\n\
@@ -41,8 +41,11 @@ $ %2$s = codec name, e.g. Opus, Theora, ...
     -p    5upr355 3d171n6 f0r m374d474_bl0ck_p1c7ur3\n\
     -U    c0nv3r7 f13ld n4m3 570r3d 1n "srcfile" 70 upp3rc453\n\
     -V    v3r1fy 7465 570r3d 1n "srcfile"\n\
-    -T    3rr0r wh3n 3d171n6 1npu7 15 n07 73rm1n473d by l1n3 f33d\n\
-    -D    d3f3r 3d171n6 10; 1mpl135 '-V', '-T'\n\
+    -T    r37urn 3rr0r wh3n 746 1npu7 15 n07 73rm1n473d by l1n3 f33d\n\
+    -D    1n l157 m0d3, d3f3r 746 0u7pu7 un71l c0mm3n7 p4ck37 15 bu1l7.\n\
+          1mpl135 -v.\n\
+          1n 4pp3n7/wr173 m0d3, r37urn 3rr0r wh3n 746 1npu7 15 3mp7y.\n\
+          1mpl135 -7\n\
 `
 
 $ opus specific options

diff --git a/nls/en_US.ISO8859-1/6.usage b/nls/en_US.ISO8859-1/6.usage
@@ -27,11 +27,11 @@ Options:\n\
     -i idx\n\
           Specify %2$s index for editing in multiplexed Ogg stream\n\
           (1-origin, without non-%2$s stream)\n\
-    -R    Assume editing IO to be encoded in UTF-8\n\
+    -R    Assume tag IO to be encoded in UTF-8\n\
     -e    Use escape sequence; \\\\, \\n, \\r and \\0\n\
-    -0    Use '\\0' separation for editing IO\n\
+    -0    Use '\\0' separation for tag IO\n\
     -t NAME=VALUE\n\
-          add the argument as editing item\n\
+          add the argument as a tag\n\
     -c tagfile\n\
           In list mode, write tags to tagfile.\n\
           In append/write mode, read tags from tagfile\n\
@@ -40,9 +40,12 @@ Options:\n\
           When VALUE is omitted, All of NAME is removed. Implies -U\n\
     -p    Supress editing for METADATA_BLOCK_PICTURE\n\
     -U    Convert field name stored in srcfile to uppercase\n\
-    -V    Verify Tags stored in srcfile\n\
-    -T    Error when editing input is not terminated by line feed\n\
-    -D    Defer editing IO; implies -V, -T\n\
+    -V    Verify tags stored in srcfile\n\
+    -T    Return error when tag input is not terminated by line feed\n\
+    -D    In list mode, defer tag output until comment packet is built.\n\
+          Implies -V.\n\
+          In appent/write mode, return error when tag input is empty.\n\
+          Implies -T\n\
 `
 
 $ opus specific options

diff --git a/nls/en_US.UTF-8/6.usage b/nls/en_US.UTF-8/6.usage
@@ -27,11 +27,11 @@ Options:\n\
     -i idx\n\
           Specify %2$s index for editing in multiplexed Ogg stream\n\
           (1-origin, without non-%2$s stream)\n\
-    -R    Assume editing IO to be encoded in UTF-8\n\
+    -R    Assume tag IO to be encoded in UTF-8\n\
     -e    Use escape sequence; \\\\, \\n, \\r and \\0\n\
-    -0    Use '\\0' separation for editing IO\n\
+    -0    Use '\\0' separation for tag IO\n\
     -t NAME=VALUE\n\
-          add the argument as editing item\n\
+          add the argument as a tag\n\
     -c tagfile\n\
           In list mode, write tags to tagfile.\n\
           In append/write mode, read tags from tagfile\n\
@@ -40,9 +40,12 @@ Options:\n\
           When VALUE is omitted, All of NAME is removed. Implies -U\n\
     -p    Supress editing for METADATA_BLOCK_PICTURE\n\
     -U    Convert field name stored in srcfile to uppercase\n\
-    -V    Verify Tags stored in srcfile\n\
-    -T    Error when editing input is not terminated by line feed\n\
-    -D    Defer editing IO; implies -V, -T\n\
+    -V    Verify tags stored in srcfile\n\
+    -T    Return error when tag input is not terminated by line feed\n\
+    -D    In list mode, defer tag output until comment packet is built.\n\
+          Implies -V.\n\
+          In appent/write mode, return error when tag input is empty.\n\
+          Implies -T\n\
 `
 
 $ opus specific options

diff --git a/nls/ja_JP.UTF-8/6.usage b/nls/ja_JP.UTF-8/6.usage
@@ -30,7 +30,7 @@ $ %2$s = コーデック名。Opus、Theora等
     -R    タグ入出力の文字符号化方式をUTF-8として扱う\n\
     -e    バックスラッシュ、改行、復帰、ヌルにそれぞれ\n\
           \\\\, \\n, \\r, \\0のエスケープを使用する\n\
-    -0    編集入出力に'\\0'区切りを使う\n\
+    -0    タグ入出力に'\\0'区切りを使う\n\
     -t NAME=VALUE\n\
           引数をタグとして追加する\n\
     -c tagfile\n\
@@ -42,8 +42,11 @@ $ %2$s = コーデック名。Opus、Theora等
     -p    METADATA_BLOCK_PICTUREの出力または削除をしない\n\
     -U    srcfile内のタグの項目名を大文字に変換する\n\
     -V    srcfile内のタグに対して書式の正当性を検証する\n\
-    -T    編集入力が改行で終わっていない場合エラーにする\n\
-    -D    編集入出力を遅延させる。-V、-Tを暗黙的に指定する\n\
+    -T    タグ入力が改行で終わっていない場合エラーにする\n\
+    -D    出力モード時、コメントパケットのパースが完了するまでタグ出力を\n\
+          遅延させる。-Vを暗黙的に指定する。\n\
+          追記・書き込みモード時、タグ入力が空の時にエラーにする。\n\
+          -Tを暗黙的に指定する\n\
 `
 
 $ Opus固有のオプション

diff --git a/nls/ja_JP.eucJP/6.usage b/nls/ja_JP.eucJP/6.usage
@@ -30,7 +30,7 @@ $ %2$s =
     -R    ���������Ϥ�ʸ����沽������UTF-8�Ȥ��ư���\n\
     -e    �Хå�����å��塢���ԡ��������̥�ˤ��줾��\n\
           \\\\, \\n, \\r, \\0�Υ��������פ���Ѥ���\n\
-    -0    �Խ������Ϥ�'\\0'���ڤ��Ȥ�\n\
+    -0    ���������Ϥ�'\\0'���ڤ��Ȥ�\n\
     -t NAME=VALUE\n\
           �����򥿥��Ȥ����ɲä���\n\
     -c tagfile\n\
@@ -42,8 +42,11 @@ $ %2$s =
     -p    METADATA_BLOCK_PICTURE�ν��Ϥޤ��Ϻ���򤷤ʤ�\n\
     -U    srcfile��Υ����ι���̾����ʸ�����Ѵ�����\n\
     -V    srcfile��Υ������Ф��ƽ񼰤��������򸡾ڤ���\n\
-    -T    �Խ����Ϥ����Ԥǽ���äƤ��ʤ���票�顼�ˤ���\n\
-    -D    �Խ������Ϥ��ٱ䤵���롣-V��-T�����Ū�˻��ꤹ��\n\
+    -T    �������Ϥ����Ԥǽ���äƤ��ʤ���票�顼�ˤ���\n\
+    -D    ���ϥ⡼�ɻ��������ȥѥ��åȤΥѡ�������λ����ޤǥ������Ϥ�\n\
+          �ٱ䤵���롣-V�����Ū�˻��ꤹ�롣\n\
+          �ɵ����񤭹��ߥ⡼�ɻ����������Ϥ����λ��˥��顼�ˤ��롣\n\
+          -T�����Ū�˻��ꤹ��\n\
 `
 
 $ Opus��ͭ�Υ��ץ����

diff --git a/src/main.c b/src/main.c
@@ -46,11 +46,11 @@ static void usage(void) {
 "    -i idx\n"
 "          Specify %2$s index for editing in multiplexed Ogg stream\n"
 "          (1-origin, without non-%2$s stream)\n"
-"    -R    Assume editing IO to be encoded in UTF-8\n"
+"    -R    Assume tag IO to be encoded in UTF-8\n"
 "    -e    Use escape sequence; \\\\, \\n, \\r and \\0\n"
-"    -0    Use '\\0' separation for editing IO\n"
+"    -0    Use '\\0' separation for tag IO\n"
 "    -t NAME=VALUE\n"
-"          Add the argument as editing item\n"
+"          Add the argument as a tag\n"
 "    -c tagfile\n"
 "          In list mode, write tags to tagfile.\n"
 "          In append/write mode, read tags from tagfile.\n"
@@ -59,9 +59,12 @@ static void usage(void) {
 "          When VALUE is omitted, All of NAME is removed. Implies -U\n"
 "    -p    Supress editing for METADATA_BLOCK_PICTURE\n"
 "    -U    Convert field name stored in srcfile to uppercase\n"
-"    -V    Verify Tags stored in srcfile\n"
-"    -T    Error when editing input is not terminated by line feed\n"
-"    -D    Defer editing IO; implies -V, -T\n"
+"    -V    Verify tags stored in srcfile\n"
+"    -T    Return error when tag input is not terminated by line feed\n"
+"    -D    In list mode, defer tag output until comment packet is built.\n"
+"          Implies -V.\n"
+"          In appent/write mode, return error when tag input is empty.\n"
+"          Implies -T\n"
 	), program_name, default_codec->name);
 	if (!default_codec->prog) {
 		fprintf(stderr, catgets(catd, 6, 5,

diff --git a/src/version.h b/src/version.h
@@ -1,5 +1,5 @@
-#define OPUSCOMMENT_VERSION "1.5.4"
+#define OPUSCOMMENT_VERSION "1.5.5"
 
 #define OPUSCOMMENT_REVISION_YEAR (2019 - 1900)
 #define OPUSCOMMENT_REVISION_MONTH (5 - 1)
-#define OPUSCOMMENT_REVISION_DAY 25
+#define OPUSCOMMENT_REVISION_DAY 28