Tera TermRevision: 10527
https://osdn.net/projects/ttssh2/scm/svn/commits/10527
Author: zmatsuo
Date: 2023-01-21 20:46:26 +0900 (Sat, 21 Jan 2023)
Log Message:
-----------
treeコマンドで文字化けする
- treeコマンドが U+00A0 NO-BREAK SPACE(NBSP) を出力していた
- `LANG=ja_JP.UTF-8 tree`
- Unicode API で描画している(標準状態)のときは文字化けしない
- ANSI API で描画するとき、NBSP(U+00A0)をACPに変換した結果が"?"になっていた
- NBSP(U+00A0)をスペース(U+0020)に変換して表示するよう修正
- 次の文字もスペース(U+0020)に変換するようにした
- U+2000 EN_QUAD
- U+2001 EM_QUAD
- U+2002 EN_SPACE
- U+2003 EM_SPACE
ticket #40669
merge from 4-stable: r10526
Revision Links:
--------------
https://osdn.net/projects/ttssh2/scm/svn/commits/10526
Ticket Links:
------------
https://osdn.net/projects/ttssh2/tracker/detail/40669
Modified Paths:
--------------
trunk/doc/en/html/about/history.html
trunk/doc/ja/html/about/history.html
trunk/teraterm/teraterm/uni2sjis.map
-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html 2023-01-21 11:42:39 UTC (rev 10526)
+++ trunk/doc/en/html/about/history.html 2023-01-21 11:46:26 UTC (rev 10527)
@@ -57,6 +57,7 @@
<li>Added setting Underline attribute(SGR 4) color and font</li>
<li>Exchanged fore and back colors of characters that attributes is setted ANSIColor when colors are reversed with DECSCNM set.</li>
<li>Invalid characters as file name contains Default log file name, are replaced with '_'.</li>
+ <li>U+00A0(NBSP) and U+2000..U+2003 are converted to SPACE and displayed. tree command output is displayed correctly.</li>
</ul>
</li>
Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html 2023-01-21 11:42:39 UTC (rev 10526)
+++ trunk/doc/ja/html/about/history.html 2023-01-21 11:46:26 UTC (rev 10527)
@@ -54,7 +54,8 @@
</ul></li>
<li>Underline\x91\xAE\x90\xAB(SGR 4)\x82̐F\x82ƃt\x83H\x83\x93\x83g\x90ݒ\xE8\x82ł\xAB\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
<li>DECSCNM set\x82ŐF\x94\xBD\x93]\x8E\x9E\x82ɁA\x91\xAE\x90\xAB\x82\xC9ANSIColor\x82\xF0\x90ݒ肵\x82\xBD\x95\xB6\x8E\x9A\x82̑O\x8Ci\x90F\x82Ɣw\x8Ci\x90F\x82\xF0\x93\xFC\x82\xEA\x91ւ\xA6\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
- <li>\x95W\x8F\x80\x83\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC\x82Ƀt\x83@\x83C\x83\x8B\x96\xBC\x82Ƃ\xB5\x82ĕs\x90\xB3\x82ȕ\xB6\x8E\x9A\x82\xAA\x8A܂܂\xEA\x82Ă\xA2\x82\xBD\x8Fꍇ\x81A'_'\x82ɒu\x8A\xB7\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD</li>
+ <li>\x95W\x8F\x80\x83\x8D\x83O\x83t\x83@\x83C\x83\x8B\x96\xBC\x82Ƀt\x83@\x83C\x83\x8B\x96\xBC\x82Ƃ\xB5\x82ĕs\x90\xB3\x82ȕ\xB6\x8E\x9A\x82\xAA\x8A܂܂\xEA\x82Ă\xA2\x82\xBD\x8Fꍇ\x81A'_'\x82ɒu\x8A\xB7\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81B</li>
+ <li>U+00A0(NBSP),U+2000..U+2003\x82\xF0U+0020(SPACE)\x82ɕϊ\xB7\x82\xB5\x82ĕ\\x8E\xA6\x82\xB7\x82\xE9\x82悤\x82ɂ\xB5\x82\xBD\x81Btree\x83R\x83}\x83\x93\x83h\x82ŕ\xB6\x8E\x9A\x89\xBB\x82\xAF\x82\xB5\x82Ȃ\xA2\x82悤\x82ɂȂ\xC1\x82\xBD\x81B</li>
</ul>
</li>
Modified: trunk/teraterm/teraterm/uni2sjis.map
===================================================================
--- trunk/teraterm/teraterm/uni2sjis.map 2023-01-21 11:42:39 UTC (rev 10526)
+++ trunk/teraterm/teraterm/uni2sjis.map 2023-01-21 11:46:26 UTC (rev 10527)
@@ -126,6 +126,7 @@
{ 0x007B, 0x007B },
{ 0x007C, 0x007C },
{ 0x007D, 0x007D },
+ { 0x00A0, 0x0020 }, // NBSP
{ 0x00A2, 0x8191 },
{ 0x00A3, 0x8192 },
{ 0x00A5, 0x005C },
@@ -253,6 +254,10 @@
{ 0x044E, 0x8490 },
{ 0x044F, 0x8491 },
{ 0x0451, 0x8476 },
+ { 0x2000, 0x0020 }, // EN_QUAD
+ { 0x2001, 0x0020 }, // EM_SPACE
+ { 0x2002, 0x0020 }, // EN_QUAD
+ { 0x2003, 0x0020 }, // EM_SPACE
{ 0x2010, 0x815D },
{ 0x2014, 0x815C },
{ 0x2015, 0x815C },