(bug 21477) Add \& to texvc

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 79db694..758d7e3 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -87,6 +87,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 4597) Provide support in Special:Contributions to show only "current"
   contributions
 * (bug 17857) {{anchorencode}} acts more like how the parser creates section ids.
+* (bug 21477) \& can now be used in <math>
 
 === Bug fixes in 1.17 ===
 * (bug 17560) Half-broken deletion moved image files to deletion archive

diff --git a/math/lexer.mll b/math/lexer.mll
index 4dd31e0..1702084 100644 (file)
--- a/math/lexer.mll
+++ b/math/lexer.mll
@@ -69,6 +69,7 @@ rule token = parse
   | "\\#"                      { LITERAL (HTMLABLE (FONT_UFH,"\\#","#")) }
   | "\\%"                      { LITERAL (HTMLABLE (FONT_UFH,"\\%","%")) }
   | "\\$"                      { LITERAL (HTMLABLE (FONT_UFH,"\\$","$")) }
+  | "\\&"                      { LITERAL (HTMLABLEC (FONT_RM,"\\&","&")) }
   | "&"                                { NEXT_CELL }
   | "\\\\"                     { NEXT_ROW }
   | "\\begin{matrix}"          { Texutil.tex_use_ams(); BEGIN__MATRIX }