deac/instiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Sync with trunk

Browse source
This commit is contained in:
Jason Blevins 2007-10-24 08:08:34 -04:00
parent 84b6602792 a92b593949
commit 1c5e5999cd
3 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/views/wiki/tex.rhtml
View file

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

11
vendor/plugins/HTML5lib/lib/html5/sanitizer.rb vendored
View file

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

3
vendor/plugins/maruku/lib/maruku/ext/math/latex_fix.rb vendored
View file

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