X-Git-Url: https://git.jankratochvil.net/?a=blobdiff_plain;f=My-Audit.pm;h=bd8de88f07bcf506884de27c28cc846088e310a0;hb=7e856e92b7199ad1d923b76b8f6a42c0660b67ae;hp=9f02c7091abb15372bcc93126493bf3a8c66b4bb;hpb=9f5eb0e159a8e41d303be37d0812a7caa1868887;p=PerlMail.git diff --git a/My-Audit.pm b/My-Audit.pm index 9f02c70..bd8de88 100644 --- a/My-Audit.pm +++ b/My-Audit.pm @@ -198,14 +198,15 @@ my(%args)=@_; # max. 9 lines of .sig s/\n-- (?:\n[^\n]*){0,9}$//gs; # "Original Message"/"Puvodni zprava" etc. up to empty line - s/(^|\n)[\s^\n]*-----[\w\s]*-----[\s^\n]*(?:\n[^\n]+)*\n{2,}(?:\s*[^>\s].*$)?/\n/gs; + # "- - - Original message: - - -" is by "Lotus Notes Release 5.0.5 September 22, 2000" + s/(^|\n)[\s^\n]*(?:-----[\w\s]*-----|- - - Original message: - - -)[\s^\n]*(?:\n[^\n]+)*\n{2,}(?:\s*[^>\s].*$)?/\n/gs; # Remove "..." lines (is it used by anyone except me?) s/^\Q...\E$/*/gm; # quoting "> " - s/^\s*[>][>\s]*.*$/*/gm; + s/^(?:\s*[[:upper:]]{0,3}>)+.*$/*/gm; s/(?:^|\n)(?:\*\n+)+/\n*\n/gs; # attributions - s/^.*\b(?:wrote|writes):\s*$//gm; + s/^.*\b(?:wrote|writes|napsal jste):\s*$//gm; my $body=$_; return [$from,"($subject)$body"];