escapen von ";" mittels ";;" eingebaut

3 files changed, 39 insertions, 33 deletions

diff --git a/Make b/Make
index 97cbcb5..4bcd710 100755
--- a/Make
+++ b/Make
diff --git a/Make.lpr b/Make.lpr
index 79fe703..6db584d 100644
--- a/Make.lpr
+++ b/Make.lpr
@@ -213,7 +213,10 @@ begin
         '}': dec(Ebene);
       end;
     until (result>=length(worin)) or ((copy(worin,result,length(was))=was) and (Ebene=0));
-    if ((result=1) or (worin[result-1]<>'\')) and (copy(worin,result,length(was))=was) then exit;
+    if
+      ((result=1) or ((worin[result-1]<>'\') and (worin[result-1]<>was))) and
+      ((result=length(worin)) or (worin[result+1]<>was)) and
+      (copy(worin,result,length(was))=was) then exit;
   end;
   result:=0;
 end;
@@ -283,6 +286,8 @@ begin
           delete(s,1,1);
         while unescapedpos(';',s)>0 do
           s:=copy(s,1,unescapedpos(';',s)-1)+' &&'+copy(s,unescapedpos(';',s)+1,length(s)-unescapedpos(';',s));
+        while pos(';;',s)>0 do
+          delete(s,pos(';;',s),1);
         NA.Befehle.Add(s);
       end;
       if fin then begin
diff --git a/Make.lps b/Make.lps
index 018c282..78994fb 100644
--- a/Make.lps
+++ b/Make.lps
@@ -11,8 +11,9 @@
         <IsVisibleTab Value="True"/>
         <EditorIndex Value="0"/>
         <WindowIndex Value="0"/>
-        <TopLine Value="1"/>
-        <CursorPos X="1" Y="1"/>
+        <TopLine Value="190"/>
+        <CursorPos X="7" Y="219"/>
+        <FoldState Value=" T3oD0n3 pjLkZ0B4 pl2lN0{3n"/>
         <UsageCount Value="32"/>
         <Loaded Value="True"/>
       </Unit0>
@@ -40,123 +41,123 @@
     <JumpHistory Count="30" HistoryIndex="29">
       <Position1>
         <Filename Value="Make.lpr"/>
-        <Caret Line="63" Column="1" TopLine="62"/>
+        <Caret Line="635" Column="1" TopLine="633"/>
       </Position1>
       <Position2>
         <Filename Value="Make.lpr"/>
-        <Caret Line="656" Column="3" TopLine="635"/>
+        <Caret Line="611" Column="1" TopLine="590"/>
       </Position2>
       <Position3>
         <Filename Value="Make.lpr"/>
-        <Caret Line="461" Column="121" TopLine="439"/>
+        <Caret Line="638" Column="50" TopLine="627"/>
       </Position3>
       <Position4>
         <Filename Value="Make.lpr"/>
-        <Caret Line="639" Column="1" TopLine="626"/>
+        <Caret Line="22" Column="1" TopLine="22"/>
       </Position4>
       <Position5>
         <Filename Value="Make.lpr"/>
-        <Caret Line="49" Column="1" TopLine="40"/>
+        <Caret Line="638" Column="12" TopLine="619"/>
       </Position5>
       <Position6>
         <Filename Value="Make.lpr"/>
-        <Caret Line="458" Column="146" TopLine="416"/>
+        <Caret Line="751" Column="35" TopLine="733"/>
       </Position6>
       <Position7>
         <Filename Value="Make.lpr"/>
-        <Caret Line="611" Column="9" TopLine="589"/>
+        <Caret Line="205" Column="29" TopLine="183"/>
       </Position7>
       <Position8>
         <Filename Value="Make.lpr"/>
-        <Caret Line="635" Column="1" TopLine="633"/>
+        <Caret Line="294" Column="44" TopLine="276"/>
       </Position8>
       <Position9>
         <Filename Value="Make.lpr"/>
-        <Caret Line="611" Column="1" TopLine="590"/>
+        <Caret Line="317" Column="42" TopLine="305"/>
       </Position9>
       <Position10>
         <Filename Value="Make.lpr"/>
-        <Caret Line="638" Column="50" TopLine="627"/>
+        <Caret Line="311" Column="3" TopLine="289"/>
       </Position10>
       <Position11>
         <Filename Value="Make.lpr"/>
-        <Caret Line="22" Column="1" TopLine="22"/>
+        <Caret Line="317" Column="43" TopLine="297"/>
       </Position11>
       <Position12>
         <Filename Value="Make.lpr"/>
-        <Caret Line="638" Column="12" TopLine="619"/>
+        <Caret Line="327" Column="1" TopLine="304"/>
       </Position12>
       <Position13>
         <Filename Value="Make.lpr"/>
-        <Caret Line="751" Column="35" TopLine="733"/>
+        <Caret Line="334" Column="1" TopLine="306"/>
       </Position13>
       <Position14>
         <Filename Value="Make.lpr"/>
-        <Caret Line="205" Column="29" TopLine="183"/>
+        <Caret Line="210" Column="18" TopLine="200"/>
       </Position14>
       <Position15>
         <Filename Value="Make.lpr"/>
-        <Caret Line="294" Column="44" TopLine="276"/>
+        <Caret Line="771" Column="61" TopLine="751"/>
       </Position15>
       <Position16>
         <Filename Value="Make.lpr"/>
-        <Caret Line="317" Column="42" TopLine="305"/>
+        <Caret Line="312" Column="1" TopLine="293"/>
       </Position16>
       <Position17>
         <Filename Value="Make.lpr"/>
-        <Caret Line="311" Column="3" TopLine="289"/>
+        <Caret Line="99" Column="55" TopLine="95"/>
       </Position17>
       <Position18>
         <Filename Value="Make.lpr"/>
-        <Caret Line="317" Column="43" TopLine="297"/>
+        <Caret Line="27" Column="53" TopLine="1"/>
       </Position18>
       <Position19>
         <Filename Value="Make.lpr"/>
-        <Caret Line="327" Column="1" TopLine="304"/>
+        <Caret Line="303" Column="36" TopLine="288"/>
       </Position19>
       <Position20>
         <Filename Value="Make.lpr"/>
-        <Caret Line="334" Column="1" TopLine="306"/>
+        <Caret Line="143" Column="1" TopLine="107"/>
       </Position20>
       <Position21>
         <Filename Value="Make.lpr"/>
-        <Caret Line="210" Column="18" TopLine="200"/>
+        <Caret Line="136" Column="59" TopLine="115"/>
       </Position21>
       <Position22>
         <Filename Value="Make.lpr"/>
-        <Caret Line="771" Column="61" TopLine="751"/>
+        <Caret Line="326" Column="35" TopLine="312"/>
       </Position22>
       <Position23>
         <Filename Value="Make.lpr"/>
-        <Caret Line="312" Column="1" TopLine="293"/>
+        <Caret Line="347" Column="47" TopLine="317"/>
       </Position23>
       <Position24>
         <Filename Value="Make.lpr"/>
-        <Caret Line="99" Column="55" TopLine="95"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position24>
       <Position25>
         <Filename Value="Make.lpr"/>
-        <Caret Line="27" Column="53" TopLine="1"/>
+        <Caret Line="612" Column="115" TopLine="592"/>
       </Position25>
       <Position26>
         <Filename Value="Make.lpr"/>
-        <Caret Line="303" Column="36" TopLine="288"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position26>
       <Position27>
         <Filename Value="Make.lpr"/>
-        <Caret Line="143" Column="1" TopLine="107"/>
+        <Caret Line="287" Column="1" TopLine="239"/>
       </Position27>
       <Position28>
         <Filename Value="Make.lpr"/>
-        <Caret Line="136" Column="59" TopLine="115"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position28>
       <Position29>
         <Filename Value="Make.lpr"/>
-        <Caret Line="326" Column="35" TopLine="312"/>
+        <Caret Line="205" Column="39" TopLine="195"/>
       </Position29>
       <Position30>
         <Filename Value="Make.lpr"/>
-        <Caret Line="347" Column="47" TopLine="317"/>
+        <Caret Line="1" Column="1" TopLine="1"/>
       </Position30>
     </JumpHistory>
   </ProjectSession>