X-Git-Url: http://git.shiar.net/perl/plp/.git/blobdiff_plain/7509565253b19493771cfc2e13ab166f1a8cc5f8..HEAD:/plp.vim

diff --git a/plp.vim b/plp.vim
index 31b55c1..adcddea 100644
--- a/plp.vim
+++ b/plp.vim
@@ -1,17 +1,15 @@
 " Vim syntax file
 " Language:	PLP (Perl in HTML)
-" Maintainer:	Juerd <juerd@juerd.nl>
-" Last Change:	2002 May 19
+" Maintainer:	Shiar <perl@shiar.org>
+" Last Change:	2011 June 17
 " Cloned From:	aspperl.vim
+" Author:	Juerd <juerd@juerd.nl>
 
 " Add to filetype.vim the following line (without quote sign):
 " au BufNewFile,BufRead *.plp setf plp
 
-" For version 5.x: Clear all syntax items
-" For version 6.x: Quit when a syntax file was already loaded
-if version < 600
-  syntax clear
-elseif exists("b:current_syntax")
+" Quit when a syntax file was already loaded
+if exists("b:current_syntax")
   finish
 endif
 
@@ -19,21 +17,22 @@ if !exists("main_syntax")
   let main_syntax = 'perlscript'
 endif
 
-if version < 600
-  so <sfile>:p:h/html.vim
-  syn include @PLPPerlScript <sfile>:p:h/perl.vim
-else
-  runtime! syntax/html.vim
-  unlet b:current_syntax
-  syn include @PLPPerlScript syntax/perl.vim
-endif
+runtime! syntax/html.vim
+unlet b:current_syntax
+syn include @PLPperl syntax/perl.vim
 
-syn cluster htmlPreproc add=PLPPerlScriptInsideHtmlTags
+syn cluster htmlPreproc add=PLPperlblock
 
-syn region  PLPPerlScriptInsideHtmlTags keepend matchgroup=Delimiter start=+<:=\=+ end=+:>+ contains=@PLPPerlScript
+syn keyword perlControl PLP_END
+syn keyword perlStatementInclude include Include
+syn keyword perlStatementFiles ReadFile WriteFile Counter
+syn keyword perlStatementScalar EscapeHTML Entity AutoURL DecodeURI EncodeURI
 
-syn cluster htmlPreproc add=PLPIncludeTag
+syn cluster PLPperlcode contains=perlStatement.*,perlFunction,perlOperator,perlVarPlain,perlVarNotInMatches,perlShellCommand,perlFloat,perlNumber,perlStringUnexpanded,perlString,perlQQ,perlControl,perlConditional,perlRepeat,perlComment,perlPOD,perlHereDoc,perlPackageDecl,perlFiledescRead,perlMatch
+  
+syn region  PLPperlblock keepend matchgroup=Delimiter start=+<:=\=+ end=+:>+ contains=@PLPperlcode
 
-syn region  PLPIncludeTag keepend matchgroup=Delimiter start=+<(+ end=+)>+ contains=@PLPIncludeFilename
+syn region  PLPinclude keepend matchgroup=Delimiter start=+<(+ end=+)>+
 
 let b:current_syntax = "plp"
+