[Ttssh2-commit] [4035] 特殊文字を変換する strspecial マクロコマンドを追加した

Back to archive index

svnno****@sourc***** svnno****@sourc*****
2010年 8月 21日 (土) 22:45:14 JST


Revision: 4035
          http://sourceforge.jp/projects/ttssh2/svn/view?view=rev&revision=4035
Author:   maya
Date:     2010-08-21 22:45:14 +0900 (Sat, 21 Aug 2010)

Log Message:
-----------
特殊文字を変換する strspecial マクロコマンドを追加した

Modified Paths:
--------------
    trunk/doc/en/html/about/history.html
    trunk/doc/en/html/macro/command/index.html
    trunk/doc/en/teraterm.hhc
    trunk/doc/en/teraterm.hhp
    trunk/doc/ja/html/about/history.html
    trunk/doc/ja/html/macro/command/index.html
    trunk/doc/ja/teraterm.hhc
    trunk/doc/ja/teraterm.hhp
    trunk/teraterm/common/helpid.h
    trunk/teraterm/ttpmacro/ttl.c
    trunk/teraterm/ttpmacro/ttmparse.c
    trunk/teraterm/ttpmacro/ttmparse.h

Added Paths:
-----------
    trunk/doc/en/html/macro/command/strspecial.html
    trunk/doc/ja/html/macro/command/strspecial.html


-------------- next part --------------
Modified: trunk/doc/en/html/about/history.html
===================================================================
--- trunk/doc/en/html/about/history.html	2010-08-21 10:38:34 UTC (rev 4034)
+++ trunk/doc/en/html/about/history.html	2010-08-21 13:45:14 UTC (rev 4035)
@@ -53,6 +53,7 @@
       <li>added the "<a href="../macro/command/strreplace.html">strreplace</a>" macro command.</li>
       <li>added the "<a href="../macro/command/strtrim.html">strtrim</a>" macro command.</li>
       <li>added the "<a href="../macro/command/strjoin.html">strjoin</a>" macro command.</li>
+      <li>added the "<a href="../macro/command/strspecial.html">strspecial</a>" macro command.</li>
     </ul>
   </li>
 

Modified: trunk/doc/en/html/macro/command/index.html
===================================================================
--- trunk/doc/en/html/macro/command/index.html	2010-08-21 10:38:34 UTC (rev 4034)
+++ trunk/doc/en/html/macro/command/index.html	2010-08-21 13:45:14 UTC (rev 4035)
@@ -122,6 +122,7 @@
  <li><a href="strremove.html">strremove</a> (version 4.67 or later)
  <li><a href="strreplace.html">strreplace</a> (version 4.67 or later)
  <li><a href="strscan.html">strscan</a>
+ <li><a href="strspecial.html">strspecial</a> (version 4.67 or later)
  <li><a href="strsplit.html">strsplit</a> (version 4.67 or later)
  <li><a href="strtrim.html">strtrim</a> (version 4.67 or later)
  <li><a href="tolower.html">tolower</a> (version 4.53 or later)

Added: trunk/doc/en/html/macro/command/strspecial.html
===================================================================
--- trunk/doc/en/html/macro/command/strspecial.html	                        (rev 0)
+++ trunk/doc/en/html/macro/command/strspecial.html	2010-08-21 13:45:14 UTC (rev 4035)
@@ -0,0 +1,60 @@
+<!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=iso-8859-1">
+  <title>strspecial</title>
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="stylesheet" href="../../style.css" type="text/css">
+</head>
+
+<body>
+
+
+<h1>strspecial</h1>
+
+<p>
+Converts special characters.
+</p>
+
+<h2>Format</h2>
+
+<pre class="macro-syntax">
+strspecial &lt;strvar&gt;
+</pre>
+
+<h2>Remarks</h2>
+
+<p>
+<!--•¶Žš—ñ•Ï” &lt;strvar&gt; ‚ÉŠÜ‚Ü‚ê‚éˆÈ‰º‚Ì•¶Žš‚ð“ÁŽê•¶Žš‚É•ÏŠ·‚·‚éB-->
+</p>
+
+<table>
+ <tr>
+  <th>input</th>
+  <th>output</th>
+ </tr>
+ <tr>
+  <td>\\</td>
+  <td>"\"</td>
+ </tr>
+ <tr>
+  <td>\n</td>
+  <td>line feed</td>
+ </tr>
+ <tr>
+  <td>\t</td>
+  <td>tab</td>
+ </tr>
+</table>
+
+<h2>Example</h2>
+
+<pre class="macro-example">
+str = "AB\tCD\nEF\\nGH"
+strspecial str
+messagebox str "special"
+</pre>
+
+</body>
+</html>

Modified: trunk/doc/en/teraterm.hhc
===================================================================
--- trunk/doc/en/teraterm.hhc	2010-08-21 10:38:34 UTC (rev 4034)
+++ trunk/doc/en/teraterm.hhc	2010-08-21 13:45:14 UTC (rev 4035)
@@ -1061,6 +1061,11 @@
 					<param name="ImageNumber" value="11">
 					</OBJECT>
 				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="strspecial">
+					<param name="Local" value="html\macro\command\strspecial.html">
+					<param name="ImageNumber" value="11">
+					</OBJECT>
+				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="strsplit">
 					<param name="Local" value="html\macro\command\strsplit.html">
 					<param name="ImageNumber" value="11">

Modified: trunk/doc/en/teraterm.hhp
===================================================================
--- trunk/doc/en/teraterm.hhp	2010-08-21 10:38:34 UTC (rev 4034)
+++ trunk/doc/en/teraterm.hhp	2010-08-21 13:45:14 UTC (rev 4035)
@@ -281,6 +281,7 @@
 HlpMacroCommandStrremove=html\macro\command\strremove.html
 HlpMacroCommandStrreplace=html\macro\command\strreplace.html
 HlpMacroCommandStrscan=html\macro\command\strscan.html
+HlpMacroCommandStrspecial=html\macro\command\strspecial.html
 HlpMacroCommandStrsplit=html\macro\command\strsplit.html
 HlpMacroCommandStrtrim=html\macro\command\strtrim.html
 HlpMacroCommandTestlink=html\macro\command\testlink.html

Modified: trunk/doc/ja/html/about/history.html
===================================================================
--- trunk/doc/ja/html/about/history.html	2010-08-21 10:38:34 UTC (rev 4034)
+++ trunk/doc/ja/html/about/history.html	2010-08-21 13:45:14 UTC (rev 4035)
@@ -55,6 +55,7 @@
       <li>ƒ}ƒNƒƒRƒ}ƒ“ƒh "<a href="../macro/command/strtrim.html">strtrim</a>" ‚ð’ljÁ‚µ‚½B</li>
       <li>ƒ}ƒNƒƒRƒ}ƒ“ƒh "<a href="../macro/command/strsplit.html">strsplit</a>" ‚ð’ljÁ‚µ‚½B</li>
       <li>ƒ}ƒNƒƒRƒ}ƒ“ƒh "<a href="../macro/command/strjoin.html">strjoin</a>" ‚ð’ljÁ‚µ‚½B</li>
+      <li>ƒ}ƒNƒƒRƒ}ƒ“ƒh "<a href="../macro/command/strspecial.html">strspecial</a>" ‚ð’ljÁ‚µ‚½B</li>
     </ul>
   </li>
 

Modified: trunk/doc/ja/html/macro/command/index.html
===================================================================
--- trunk/doc/ja/html/macro/command/index.html	2010-08-21 10:38:34 UTC (rev 4034)
+++ trunk/doc/ja/html/macro/command/index.html	2010-08-21 13:45:14 UTC (rev 4035)
@@ -122,6 +122,7 @@
  <li><a href="strremove.html">strremove</a> (ƒo[ƒWƒ‡ƒ“4.67ˆÈ~)
  <li><a href="strreplace.html">strreplace</a> (ƒo[ƒWƒ‡ƒ“4.67ˆÈ~)
  <li><a href="strscan.html">strscan</a>
+ <li><a href="strspecial.html">strspecial</a> (ƒo[ƒWƒ‡ƒ“4.67ˆÈ~)
  <li><a href="strsplit.html">strsplit</a> (ƒo[ƒWƒ‡ƒ“4.67ˆÈ~)
  <li><a href="strtrim.html">strtrim</a> (ƒo[ƒWƒ‡ƒ“4.67ˆÈ~)
  <li><a href="tolower.html">tolower</a> (ƒo[ƒWƒ‡ƒ“4.53ˆÈ~)

Added: trunk/doc/ja/html/macro/command/strspecial.html
===================================================================
--- trunk/doc/ja/html/macro/command/strspecial.html	                        (rev 0)
+++ trunk/doc/ja/html/macro/command/strspecial.html	2010-08-21 13:45:14 UTC (rev 4035)
@@ -0,0 +1,60 @@
+<!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>strspecial</title>
+  <meta http-equiv="Content-Style-Type" content="text/css">
+  <link rel="stylesheet" href="../../style.css" type="text/css">
+</head>
+
+<body>
+
+
+<h1>strspecial</h1>
+
+<p>
+“ÁŽê•¶Žš‚ð•ÏŠ·‚·‚éB
+</p>
+
+<h2>Œ`Ž®</h2>
+
+<pre class="macro-syntax">
+strspecial &lt;strvar&gt;
+</pre>
+
+<h2>‰ðà</h2>
+
+<p>
+•¶Žš—ñ•Ï” &lt;strvar&gt; ‚ÉŠÜ‚Ü‚ê‚éˆÈ‰º‚Ì•¶Žš‚ð“ÁŽê•¶Žš‚É•ÏŠ·‚·‚éB
+</p>
+
+<table>
+ <tr>
+  <th>“ü—Í</th>
+  <th>o—Í</th>
+ </tr>
+ <tr>
+  <td>\\</td>
+  <td>"\"</td>
+ </tr>
+ <tr>
+  <td>\n</td>
+  <td>‰üs</td>
+ </tr>
+ <tr>
+  <td>\t</td>
+  <td>ƒ^ƒu</td>
+ </tr>
+</table>
+
+<h2>—á</h2>
+
+<pre class="macro-example">
+str = "AB\tCD\nEF\\nGH"
+strspecial str
+messagebox str "special"
+</pre>
+
+</body>
+</html>

Modified: trunk/doc/ja/teraterm.hhc
===================================================================
--- trunk/doc/ja/teraterm.hhc	2010-08-21 10:38:34 UTC (rev 4034)
+++ trunk/doc/ja/teraterm.hhc	2010-08-21 13:45:14 UTC (rev 4035)
@@ -1067,6 +1067,11 @@
 					<param name="ImageNumber" value="11">
 					</OBJECT>
 				<LI> <OBJECT type="text/sitemap">
+					<param name="Name" value="strspecial">
+					<param name="Local" value="html\macro\command\strspecial.html">
+					<param name="ImageNumber" value="11">
+					</OBJECT>
+				<LI> <OBJECT type="text/sitemap">
 					<param name="Name" value="strsplit">
 					<param name="Local" value="html\macro\command\strsplit.html">
 					</OBJECT>

Modified: trunk/doc/ja/teraterm.hhp
===================================================================
--- trunk/doc/ja/teraterm.hhp	2010-08-21 10:38:34 UTC (rev 4034)
+++ trunk/doc/ja/teraterm.hhp	2010-08-21 13:45:14 UTC (rev 4035)
@@ -291,6 +291,7 @@
 HlpMacroCommandStrremove=html\macro\command\strremove.html
 HlpMacroCommandStrreplace=html\macro\command\strreplace.html
 HlpMacroCommandStrscan=html\macro\command\strscan.html
+HlpMacroCommandStrspecial=html\macro\command\strspecial.html
 HlpMacroCommandStrsplit=html\macro\command\strsplit.html
 HlpMacroCommandStrtrim=html\macro\command\strtrim.html
 HlpMacroCommandTestlink=html\macro\command\testlink.html

Modified: trunk/teraterm/common/helpid.h
===================================================================
--- trunk/teraterm/common/helpid.h	2010-08-21 10:38:34 UTC (rev 4034)
+++ trunk/teraterm/common/helpid.h	2010-08-21 13:45:14 UTC (rev 4035)
@@ -289,6 +289,7 @@
 #define HlpMacroCommandStrremove        92181
 #define HlpMacroCommandStrreplcae       92182
 #define HlpMacroCommandStrscan          92096
+#define HlpMacroCommandStrspecial       92186
 #define HlpMacroCommandStrsplit         92184
 #define HlpMacroCommandStrtrim          92183
 #define HlpMacroCommandTestlink         92097

Modified: trunk/teraterm/ttpmacro/ttl.c
===================================================================
--- trunk/teraterm/ttpmacro/ttl.c	2010-08-21 10:38:34 UTC (rev 4034)
+++ trunk/teraterm/ttpmacro/ttl.c	2010-08-21 13:45:14 UTC (rev 4035)
@@ -3562,6 +3562,24 @@
 	return Err;
 }
 
+WORD TTLStrSpecial()
+{
+	WORD Err, VarId;
+	char *srcptr;
+
+	Err = 0;
+	GetStrVar(&VarId,&Err);
+
+	if ((Err==0) && (GetFirstChar()!=0))
+		Err = ErrSyntax;
+	if (Err!=0) return Err;
+
+	srcptr = StrVarPtr(VarId);
+	RestoreNewLine(srcptr);
+
+	return Err;
+}
+
 WORD TTLStrTrim()
 {
 	TStrVal trimchars;
@@ -4645,6 +4663,8 @@
 			Err = TTLStrReplace(); break;
 		case RsvStrScan:
 			Err = TTLStrScan(); break;
+		case RsvStrSpecial:
+			Err = TTLStrSpecial(); break;
 		case RsvStrSplit:
 			Err = TTLStrSplit(); break;
 		case RsvStrTrim:

Modified: trunk/teraterm/ttpmacro/ttmparse.c
===================================================================
--- trunk/teraterm/ttpmacro/ttmparse.c	2010-08-21 10:38:34 UTC (rev 4034)
+++ trunk/teraterm/ttpmacro/ttmparse.c	2010-08-21 13:45:14 UTC (rev 4035)
@@ -295,6 +295,7 @@
 		else if (_stricmp(Str,"strremove")==0) *WordId = RsvStrRemove;
 		else if (_stricmp(Str,"strreplace")==0) *WordId = RsvStrReplace;
 		else if (_stricmp(Str,"strscan")==0) *WordId = RsvStrScan;
+		else if (_stricmp(Str,"strspecial")==0) *WordId = RsvStrSpecial;
 		else if (_stricmp(Str,"strsplit")==0) *WordId = RsvStrSplit;
 		else if (_stricmp(Str,"strtrim")==0) *WordId = RsvStrTrim;
 		break;

Modified: trunk/teraterm/ttpmacro/ttmparse.h
===================================================================
--- trunk/teraterm/ttpmacro/ttmparse.h	2010-08-21 10:38:34 UTC (rev 4034)
+++ trunk/teraterm/ttpmacro/ttmparse.h	2010-08-21 13:45:14 UTC (rev 4035)
@@ -201,6 +201,7 @@
 #define RsvStrTrim      183
 #define RsvStrSplit     184
 #define RsvStrJoin      185
+#define RsvStrSpecial   186
 
 #define RsvOperator     1000
 #define RsvBNot         1001



Ttssh2-commit メーリングリストの案内
Back to archive index