Sync with trunk

app/views/wiki/tex.rhtml

@@ -35,7 +35,6 @@
 
 % Because of conflicts, \space and \mathop are converted to
 % \itexspace and \operatorname during preprocessing.
-% \over is simply unsupported.
 
 % itex: \space{ht}{dp}{wd}
 %

vendor/plugins/HTML5lib/lib/html5/sanitizer.rb

@@ -26,9 +26,10 @@ module HTML5
       strike strong sub sup table tbody td textarea tfoot th thead tr tt u
       ul var]
 
-    MATHML_ELEMENTS = %w[maction math merror mfrac mi mmultiscripts mn mo
-      mover mpadded mphantom mprescripts mroot mrow mspace msqrt mstyle msub
-      msubsup msup mtable mtd mtext mtr munder munderover none]
+    MATHML_ELEMENTS = %w[annotation annotation-xml maction math merror mfrac
+      mi mmultiscripts mn mo mover mpadded mphantom mprescripts mroot mrow
+      mspace msqrt mstyle msub msubsup msup mtable mtd mtext mtr munder
+      munderover none semantics]
 
     SVG_ELEMENTS = %w[a animate animateColor animateMotion animateTransform
       circle defs desc ellipse font-face font-face-name font-face-src g
@@ -47,8 +48,8 @@ module HTML5
 
     MATHML_ATTRIBUTES = %w[actiontype align columnalign columnalign
       columnalign columnlines columnspacing columnspan depth display
-      displaystyle equalcolumns equalrows fence fontstyle fontweight frame
-      height linethickness lspace mathbackground mathcolor mathvariant
+      displaystyle encoding equalcolumns equalrows fence fontstyle fontweight
+      frame height linethickness lspace mathbackground mathcolor mathvariant
       mathvariant maxsize minsize other rowalign rowalign rowalign rowlines
       rowspacing rowspan rspace scriptlevel selection separator stretchy
       width width xlink:href xlink:show xlink:type xmlns xmlns:xlink]

vendor/plugins/maruku/lib/maruku/ext/math/latex_fix.rb

@@ -3,7 +3,8 @@ class String
 	def fix_latex
 		if #{html_math_engine} == 'itex2mml'
 			s = self.gsub("\\mathop{", "\\operatorname{")
-			s.gsub("\\space{", "\\itexspace{")
+			s.gsub!(/\\begin{svg}.*?\\end{svg}/m, " ")
+                        s.gsub("\\space{", "\\itexspace{")
 		else
 			self
 		end