From 5957cff999526f2e1b1dfe5a8d5369b0ea064e4e Mon Sep 17 00:00:00 2001
From: peter <peter@freepascal.org>
Date: Sun, 9 Jul 2000 17:39:05 +0000
Subject: [PATCH]   * escape $ with \$

---
 compiler/utils/msg2inc.pp | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/compiler/utils/msg2inc.pp b/compiler/utils/msg2inc.pp
index 93bd8e639e..12cfdfb77d 100644
--- a/compiler/utils/msg2inc.pp
+++ b/compiler/utils/msg2inc.pp
@@ -592,8 +592,13 @@ Var
 begin
   hs:='';
   for i:=1 to length(s) do
-    if (S[i]='$') and (s[i+1] in ['0'..'9']) then
-      hs:=hs+'arg'
+    if (S[i]='$') then
+     begin
+       if (s[i+1] in ['0'..'9']) then
+        hs:=hs+'arg'
+       else
+        hs:=hs+'\$';
+     end
     else
       hs:=hs+s[i];
   EscapeString:=hs;
@@ -769,7 +774,9 @@ begin
                   Renumberfile(Infile,OutFile);
                 end;
         M_Tex : begin
-                  WriteTexFile(InFile,OutFile+'.tex');
+                  if pos('.tex',outfile)=0 then
+                   Outfile:=OutFile+'.tex';
+                  WriteTexFile(InFile,Outfile);
                 end;
       M_Intel : begin
                   Loadmsgfile(InFile);
@@ -790,7 +797,10 @@ begin
 end.
 {
   $Log$
-  Revision 1.11  2000-07-09 17:01:26  peter
+  Revision 1.12  2000-07-09 17:39:05  peter
+    * escape $ with \$
+
+  Revision 1.11  2000/07/09 17:01:26  peter
     * replace only $ with arg if next char is a number
 
   Revision 1.10  2000/07/09 16:30:59  peter