Tera TermRevision: 8800
https://osdn.net/projects/ttssh2/scm/svn/commits/8800
Author: zmatsuo
Date: 2020-06-15 11:07:36 +0900 (Mon, 15 Jun 2020)
Log Message:
-----------
コーディングプロパティページのヘルプを追加
- 次の2項目について
- Ambiguous Characters width
- Override Emoji Characters width
- 日本語のみ
Modified Paths:
--------------
trunk/doc/en/teraterm.hhc
trunk/doc/en/teraterm.hhp
trunk/doc/ja/teraterm.hhc
trunk/doc/ja/teraterm.hhp
trunk/teraterm/common/helpid.h
trunk/teraterm/teraterm/coding_pp.cpp
Added Paths:
-----------
trunk/doc/ja/html/menu/setup-additional-coding.html
-------------- next part --------------
Modified: trunk/doc/en/teraterm.hhc
===================================================================
--- trunk/doc/en/teraterm.hhc 2020-06-15 02:07:26 UTC (rev 8799)
+++ trunk/doc/en/teraterm.hhc 2020-06-15 02:07:36 UTC (rev 8800)
@@ -336,6 +336,11 @@
<param name="ImageNumber" value="11">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
+ <param name="Name" value="Additional settings/coding">
+ <param name="Local" value="html\menu\setup-additional-coding.html">
+ <param name="ImageNumber" value="11">
+ </OBJECT>
+ <LI> <OBJECT type="text/sitemap">
<param name="Name" value="Save setup">
<param name="Local" value="html\menu\setup-save.html">
<param name="ImageNumber" value="11">
Modified: trunk/doc/en/teraterm.hhp
===================================================================
--- trunk/doc/en/teraterm.hhp 2020-06-15 02:07:26 UTC (rev 8799)
+++ trunk/doc/en/teraterm.hhp 2020-06-15 02:07:36 UTC (rev 8800)
@@ -127,6 +127,7 @@
HlpMenuSetupSshkeygen=html\menu\setup-sshkeygenerator.html
HlpMenuSetupTcpip=html\menu\setup-tcpip.html
HlpMenuSetupAdditional=html\menu\setup-additional.html
+HlpMenuSetupAdditionalCoding=html\menu\setup-additional-coding.html
HlpMenuSetupSave=html\menu\setup-save.html
HlpMenuSetupRestore=html\menu\setup-restore.html
HlpMenuSetupDir=html\menu\setup-directory.html
Added: trunk/doc/ja/html/menu/setup-additional-coding.html
===================================================================
--- trunk/doc/ja/html/menu/setup-additional-coding.html (rev 0)
+++ trunk/doc/ja/html/menu/setup-additional-coding.html 2020-06-15 02:07:36 UTC (rev 8800)
@@ -0,0 +1,87 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
+ "http://www.w3.org/TR/html4/strict.dtd">
+<html>
+ <head>
+ <meta http-equiv="Content-Type" content="text/html; charset=Shift_JIS">
+ <title>Additional settings / "coding" \x83^\x83u ([Setup] \x83\x81\x83j\x83\x85\x81[)</title>
+ <META http-equiv="Content-Style-Type" content="text/css">
+ <link rel="stylesheet" href="../style.css" type="text/css">
+ </head>
+
+ <body>
+ <h1>Additional settings / "coding" \x83^\x83u ([Setup] \x83\x81\x83j\x83\x85\x81[)</h1>
+
+ <dl>
+ <dt>Ambiguous Characters width</dt>
+ <dd>
+ 1 Cell \x82܂\xBD\x82\xCD 2 Cell \x82\xF0\x91I\x91\xF0\x81B
+ </dd>
+
+ <dt>Override Emoji Characters width</dt>
+ <dd>
+ \x95\xB6\x8E\x9A\x82\xAA\x8AG\x95\xB6\x8E\x9A\x82̂Ƃ\xAB\x81A\x95\xB6\x8E\x9A\x91\xAE\x90\xAB\x82\x8B\x82\xB5\x82ĕ\xB6\x8E\x9A\x95\x9D\x82\xF0\x90ݒ肷\x82\xE9\x8Fꍇ\x83`\x83F\x83b\x83N\x82\xB7\x82\xE9<br>
+ 1 Cell \x82܂\xBD\x82\xCD 2 Cell \x82\xF0\x91I\x91\xF0\x81B
+ </dd>
+ </dl>
+
+ <h2>East_Asian_Width\x93\xC1\x90\xAB\x82ƃZ\x83\x8B\x90\x94\x82ɂ\xA2\x82\xC4</h2>
+
+ <p>
+ East Asian Width(\x93\x8C\x83A\x83W\x83A\x82̕\xB6\x8E\x9A\x95\x9D)\x82Ƃ\xB5\x82āA
+ \x8Ae\x95\xB6\x8E\x9A\x82ɂ͓\xC1\x90\xAB\x82\xAA\x8A\x84\x82蓖\x82Ă\xE7\x82\xEA\x82Ă\xA2\x82܂\xB7\x81B
+ </p>
+
+ <p>
+ \x82\xB1\x82̓\xC1\x90\xAB\x82\xCD5\x8E\xED\x97ޑ\xB6\x8D݂\xB5\x81A\x8Ae\x81X\x82̕\xB6\x8E\x9A\x95\x9D\x82\xAA\x8C\x88\x82߂\xE7\x82\xEA\x82Ă\xA2\x82܂\xB7\x81B
+ </p>
+
+ <p>
+ \x82܂\xBD\x81A\x95\xB6\x8E\x9A\x95\x9D\x82̉\xF0\x8E߂ɂ͎\x9F\x82\xCC2\x8E\xED\x97ނ\xAA\x82\xA0\x82\xE8\x82܂\xB7\x81B
+ <ol>
+ <li>\x93\x8C\x83A\x83W\x83A\x82̏]\x97\x88\x95\xB6\x8E\x9A\x83R\x81[\x83h\x82̕\xB6\x96\xAC\x82̏ꍇ</li>
+ <li>\x93\x8C\x83A\x83W\x83A\x88ȊO\x82̏]\x97\x88\x95\xB6\x8E\x9A\x83R\x81[\x83h\x82̕\xB6\x96\xAC\x82̏ꍇ</li>
+ </ol>
+ </p>
+
+ <p>
+ \x82\xB1\x82\xEA\x82\xF0\x95\\x82ɂ\xB7\x82\xE9\x82Ǝ\x9F\x82̂悤\x82ɂȂ\xE8\x82܂\xB7\x81B
+ </p>
+
+<pre>
+cells\x90\x94(2=\x91S\x8Ap/1=\x94\xBC\x8Ap)
+| | \x93\x8C\x83A\x83W\x83A\x82\xCC | \x93\x8C\x83A\x83W\x83A\x88ȊO\x82\xCC |
+| \x93\xC1\x90\xAB | \x8F]\x97\x88\x95\xB6\x8E\x9A\x83R\x81[\x83h\x82̕\xB6\x96\xAC | \x8F]\x97\x88\x95\xB6\x8E\x9A\x83R\x81[\x83h\x82̕\xB6\x96\xAC |
+| F(Fullwidth,\x91S\x8Ap) | 2 | 2 |
+| H(Halfwidth,\x94\xBC\x8Ap) | 1 | 1 |
+| W(Wide,\x8DL) | 2 | 2 |
+| Na(Narrow,\x8B\xB7) | 1 | 1 |
+| A(Ambiguous,\x9EB\x96\x86) | 2 | 1 |
+| N(Neutral,\x92\x86\x97\xA7) | 1 | 1 |
+</pre>
+
+ <p>
+ CJK\x8A\xAB\x82ł́AAmbiguous\x82̏ꍇ\x82ɕ\xB6\x8E\x9A\x95\x9D\x82\xF02 cell\x82ɂ\xB5\x82\xBD\x82ق\xA4\x82\xAA\x8E\xA9\x91R\x82ł\xB7\x81B
+ </p>
+
+ <p>
+ Neutral\x82͓\x8C\x83A\x83W\x83A\x82̑g\x94łɂ͒ʏ\xED\x8Fo\x8C\xBB\x82\xB5\x82Ȃ\xA2\x8E\x96\x82ɂȂ\xC1\x82Ă\xA2\x82܂\xB7\x82\xAA\x81A
+ \x8AG\x95\xB6\x8E\x9A\x82\xAA\x82\xB1\x82̗̈\xE6\x82ɓ\xFC\x82\xC1\x82Ă\xA2\x82܂\xB7\x81B
+ </p>
+
+ <p>
+ East Asian Width \x82̓\xC1\x90\xAB\x82Ƃ͕ʂɁA\x8Ae\x95\xB6\x8E\x9A\x82ɂ͊G\x95\xB6\x8E\x9A\x91\xAE\x90\xAB\x82\xAA\x82\xA0\x82\xE8\x82܂\xB7\x81B
+ (Tera Term\x82ł̓R\x81[\x83h\x83|\x83C\x83\x93\x83gU+0080\x96\xA2\x96\x9E\x82͊G\x95\xB6\x8E\x9A\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA2\x82܂\xB9\x82\xF1)
+ </p>
+
+ <p>
+ CJK\x8A\xAB\x82ł͏]\x97\x88\x82̕\xB6\x8E\x9A\x83R\x81[\x83h\x82\xC51byte\x82ł͕\\x8C\xBB\x82ł\xAB\x82Ȃ\xA2\x8Fꍇ\x82\xCD
+ 2cell\x82ň\xB5\x82\xA4\x82ق\xA4\x82\xAA\x8E\xA9\x91R\x82ł\xB7\x81B
+ Tera term\x82ł\xCDEast Asian Width\x82\x8B\x82\xB5\x82\xC42 cell\x82Ƃ\xB5\x82Ĉ\xB5\x82\xA4\x82\xB1\x82Ƃ\xAA\x82ł\xAB\x82\xE9\x82悤\x90ݒ肪\x89\\x82ł\xB7\x81B
+ </p>
+
+ <p>
+ \x82܂\xBD\x81A\x93\xFA\x96{\x8C\xEA\x83t\x83H\x83\x93\x83g\x82ł͊G\x95\xB6\x8E\x9A\x82\xCD2cell\x82Ńf\x83U\x83C\x83\x93\x82\xB3\x82\xEA\x82Ă\xA2\x82邱\x82Ƃ\xAA\x91\xBD\x82\xA2\x82Ǝv\x82\xED\x82\xEA\x82܂\xB7\x81B
+ </p>
+
+ </body>
+</html>
Modified: trunk/doc/ja/teraterm.hhc
===================================================================
--- trunk/doc/ja/teraterm.hhc 2020-06-15 02:07:26 UTC (rev 8799)
+++ trunk/doc/ja/teraterm.hhc 2020-06-15 02:07:36 UTC (rev 8800)
@@ -345,6 +345,11 @@
<param name="ImageNumber" value="11">
</OBJECT>
<LI> <OBJECT type="text/sitemap">
+ <param name="Name" value="Additional settings/coding">
+ <param name="Local" value="html\menu\setup-additional-coding.html">
+ <param name="ImageNumber" value="11">
+ </OBJECT>
+ <LI> <OBJECT type="text/sitemap">
<param name="Name" value="Save setup">
<param name="Local" value="html\menu\setup-save.html">
<param name="ImageNumber" value="11">
Modified: trunk/doc/ja/teraterm.hhp
===================================================================
--- trunk/doc/ja/teraterm.hhp 2020-06-15 02:07:26 UTC (rev 8799)
+++ trunk/doc/ja/teraterm.hhp 2020-06-15 02:07:36 UTC (rev 8800)
@@ -135,6 +135,7 @@
HlpMenuSetupSshkeygen=html\menu\setup-sshkeygenerator.html
HlpMenuSetupTcpip=html\menu\setup-tcpip.html
HlpMenuSetupAdditional=html\menu\setup-additional.html
+HlpMenuSetupAdditionalCoding=html\menu\setup-additional-coding.html
HlpMenuSetupSave=html\menu\setup-save.html
HlpMenuSetupRestore=html\menu\setup-restore.html
HlpMenuSetupDir=html\menu\setup-directory.html
Modified: trunk/teraterm/common/helpid.h
===================================================================
--- trunk/teraterm/common/helpid.h 2020-06-15 02:07:26 UTC (rev 8799)
+++ trunk/teraterm/common/helpid.h 2020-06-15 02:07:36 UTC (rev 8800)
@@ -156,6 +156,7 @@
#define HlpMenuSetupSshkeygen 43010
#define HlpMenuSetupTcpip 43011
#define HlpMenuSetupAdditional 43012
+#define HlpMenuSetupAdditionalCoding 43020
#define HlpMenuSetupSave 43013
#define HlpMenuSetupRestore 43014
#define HlpMenuSetupDir 43016
Modified: trunk/teraterm/teraterm/coding_pp.cpp
===================================================================
--- trunk/teraterm/teraterm/coding_pp.cpp 2020-06-15 02:07:26 UTC (rev 8799)
+++ trunk/teraterm/teraterm/coding_pp.cpp 2020-06-15 02:07:36 UTC (rev 8800)
@@ -40,6 +40,7 @@
#include "compat_win.h"
#include "setting.h"
#include "layer_for_unicode.h"
+#include "helpid.h"
#include "coding_pp.h"
@@ -224,10 +225,12 @@
break;
}
- case PSN_HELP:
- MessageBox(hWnd, "Tera Term", "not implimented",
- MB_OK | MB_ICONEXCLAMATION);
+ case PSN_HELP: {
+ HWND vtwin = GetParent(hWnd);
+ vtwin = GetParent(vtwin);
+ PostMessage(vtwin, WM_USER_DLGHELP2, HlpMenuSetupAdditionalCoding, 0);
break;
+ }
default:
break;
}
@@ -325,7 +328,7 @@
psp.pResource = Param->dlg_templ;
#endif
psp.pszTitle = L"coding"; // TODO lng \x83t\x83@\x83C\x83\x8B\x82ɓ\xFC\x82\xEA\x82\xE9
- psp.dwFlags |= (PSP_USETITLE /*| PSP_HASHELP */);
+ psp.dwFlags |= (PSP_USETITLE | PSP_HASHELP);
psp.pfnDlgProc = Proc;
psp.lParam = (LPARAM)Param;