Merge branch 'bzr/golem' of /Users/distler/Sites/code/instiki

This commit is contained in:
Jacques Distler 2009-12-25 12:04:10 -06:00
commit d9467ba836

View file

@ -67,8 +67,9 @@ module Syntax
nav noscript object ol optgroup option output p param pre nav noscript object ol optgroup option output p param pre
progress q rp rt ruby samp script section select small progress q rp rt ruby samp script section select small
source span strong style sub sup table tbody td textarea source span strong style sub sup table tbody td textarea
tfoot th thead time title tr ul var tfoot th thead time title tr ul var video
video} unless const_defined?(:HTML_TAGS) acronym applet big center frame frameset isindex marquee
noframes s tt u} unless const_defined?(:HTML_TAGS)
MATHML_TAGS = Set.new %w{annotation annotation-xml maction MATHML_TAGS = Set.new %w{annotation annotation-xml maction
malign maligngroup malignmark malignscope math menclose malign maligngroup malignmark malignscope math menclose