From: Conrad Irwin <conrad@users.mediawiki.org>
Date: Mon, 21 Jun 2010 22:09:05 +0000 (+0000)
Subject: (bug 21477) Add \& to texvc
X-Git-Tag: 1.31.0-rc.0~36421
X-Git-Url: https://git.cyclocoop.org/%27.%24link.%27?a=commitdiff_plain;h=0ffe7d3a8f7ab85b854054fd902fd9e0ef9a9772;p=lhc%2Fweb%2Fwiklou.git

(bug 21477) Add \& to texvc
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 79db694b22..758d7e35d4 100644
--- 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 4dd31e0ecc..1702084c53 100644
--- 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,"\\&","&amp;")) }
   | "&"				{ NEXT_CELL }
   | "\\\\"			{ NEXT_ROW }
   | "\\begin{matrix}"		{ Texutil.tex_use_ams(); BEGIN__MATRIX }