From 079e369e91e88bc74ca38c9957ba19837ddaf40a Mon Sep 17 00:00:00 2001 From: Mark Griffiths Date: Sat, 16 Aug 2014 10:18:41 +0100 Subject: [PATCH] Fix ampersand redirector --- .gitignore | 2 ++ lexicon_filter.in | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 41fe352b4..63e163f6a 100644 --- a/.gitignore +++ b/.gitignore @@ -49,3 +49,5 @@ doc_src/.editorconfig lexicon.log + +.DS_Store diff --git a/lexicon_filter.in b/lexicon_filter.in index f506f2919..a1f638a4e 100644 --- a/lexicon_filter.in +++ b/lexicon_filter.in @@ -422,9 +422,10 @@ x # A special case. Tidy up after commands. # Redirectors s/\([^{|] *\)|/\1@redr{|}/g +s/&$/@redr{\&}/ s/\([^{&] *\)&[^a-z]/\1@redr{\&}/g s/\([^{<>^] *\)\([0-9]* *[<>^][<>^]*[^@][a-zA-Z0-9._-]*\)/\1@redr{\2}/g -s/\\}/}\\/g +#s/\\}/}\\/g #. # Now we can add in 'unsafe' entities that would be too greedy. # Declared Variables