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

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

Browse source
This commit is contained in:
Jacques Distler 2009-05-07 17:03:03 -05:00
parent 80c3c15143 681065631c
commit 4d34abc8fa
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/sanitizer.rb
View file

@ -22,7 +22,7 @@ module Sanitizer
munderover none semantics] 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 circle clipPath defs desc ellipse font-face font-face-name font-face-src
foreignObject g glyph hkern linearGradient line marker metadata foreignObject g glyph hkern linearGradient line marker metadata
missing-glyph mpath path polygon polyline radialGradient rect set missing-glyph mpath path polygon polyline radialGradient rect set
stop svg switch text title tspan use] stop svg switch text title tspan use]
@ -47,11 +47,11 @@ module Sanitizer
svg_attributes = %w[accent-height accumulate additive alphabetic svg_attributes = %w[accent-height accumulate additive alphabetic
arabic-form ascent attributeName attributeType baseProfile bbox begin arabic-form ascent attributeName attributeType baseProfile bbox begin
by calcMode cap-height class color color-rendering content cx cy d dx by calcMode cap-height class clip-path clip-rule color color-rendering
dy descent display dur end fill fill-opacity fill-rule font-family content cx cy d dx dy descent display dur end fill fill-opacity fill-rule
font-size font-stretch font-style font-variant font-weight from fx fy g1 font-family font-size font-stretch font-style font-variant font-weight from
g2 glyph-name gradientUnits hanging height horiz-adv-x horiz-origin-x id fx fy g1 g2 glyph-name gradientUnits hanging height horiz-adv-x horiz-origin-x
ideographic k keyPoints keySplines keyTimes lang marker-end id ideographic k keyPoints keySplines keyTimes lang marker-end
marker-mid marker-start markerHeight markerUnits markerWidth marker-mid marker-start markerHeight markerUnits markerWidth
mathematical max min name offset opacity orient origin mathematical max min name offset opacity orient origin
overline-position overline-thickness panose-1 path pathLength points overline-position overline-thickness panose-1 path pathLength points

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

@ -32,10 +32,10 @@ module HTML5
munderover none semantics] 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 foreignObject circle clipPath defs desc ellipse font-face font-face-name font-face-src
g glyph hkern linearGradient line marker metadata missing-glyph foreignObject g glyph hkern linearGradient line marker metadata
mpath path polygon polyline radialGradient rect set stop svg switch missing-glyph mpath path polygon polyline radialGradient rect set
text title tspan use] stop svg switch text title tspan use]
ACCEPTABLE_ATTRIBUTES = %w[abbr accept accept-charset accesskey action ACCEPTABLE_ATTRIBUTES = %w[abbr accept accept-charset accesskey action
align alt axis border cellpadding cellspacing char charoff charset align alt axis border cellpadding cellspacing char charoff charset
@ -56,11 +56,11 @@ module HTML5
SVG_ATTRIBUTES = %w[accent-height accumulate additive alphabetic SVG_ATTRIBUTES = %w[accent-height accumulate additive alphabetic
arabic-form ascent attributeName attributeType baseProfile bbox begin arabic-form ascent attributeName attributeType baseProfile bbox begin
by calcMode cap-height class color color-rendering content cx cy d dx by calcMode cap-height class clip-path clip-rule color color-rendering
dy descent display dur end fill fill-opacity fill-rule font-family content cx cy d dx dy descent display dur end fill fill-opacity fill-rule
font-size font-stretch font-style font-variant font-weight from fx fy g1 font-family font-size font-stretch font-style font-variant font-weight from
g2 glyph-name gradientUnits hanging height horiz-adv-x horiz-origin-x id fx fy g1 g2 glyph-name gradientUnits hanging height horiz-adv-x horiz-origin-x
ideographic k keyPoints keySplines keyTimes lang marker-end id ideographic k keyPoints keySplines keyTimes lang marker-end
marker-mid marker-start markerHeight markerUnits markerWidth marker-mid marker-start markerHeight markerUnits markerWidth
mathematical max min name offset opacity orient origin mathematical max min name offset opacity orient origin
overline-position overline-thickness panose-1 path pathLength points overline-position overline-thickness panose-1 path pathLength points