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-12-25 04:19:21 -06:00
parent b4589e197d c1420153d8
commit 77ae91124c
1 changed files with 38 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

53
vendor/plugins/syntax/lib/syntax/lang/css21.rb vendored
View file

@ -1,11 +1,10 @@
require 'syntax' require 'syntax'
require 'stringsupport'
module Syntax module Syntax
class CSS21 < Tokenizer class CSS21 < Tokenizer
CSS21_PROPERTIES = %w{font-family font-style font-variant font-weight CSS21_PROPERTIES = Set.new %w{font-family font-style font-variant font-weight
font-size font background-color background-image font-size font background-color background-image
background-repeat background-attachment background-position background-repeat background-attachment background-position
color background word-spacing letter-spacing color background word-spacing letter-spacing
@ -36,7 +35,7 @@ module Syntax
page-break-before page-break-after page-break-inside page-break-before page-break-after page-break-inside
orphans widows} unless const_defined?(:CSS21_PROPERTIES) orphans widows} unless const_defined?(:CSS21_PROPERTIES)
CSS21_KEYWORDS = %w{maroon red orange yellow olive purple CSS21_KEYWORDS = Set.new %w{maroon red orange yellow olive purple
fuchsia white lime green navy blue aqua teal black silver gray fuchsia white lime green navy blue aqua teal black silver gray
scroll fixed transparent none top center bottom scroll fixed transparent none top center bottom
left right repeat repeat-x repeat-y no-repeat left right repeat repeat-x repeat-y no-repeat
@ -59,17 +58,41 @@ module Syntax
serif sans-serif monospace cursive serif sans-serif monospace cursive
fantasy, always} unless const_defined?(:CSS21_KEYWORDS) fantasy, always} unless const_defined?(:CSS21_KEYWORDS)
HTML401_TAGS = %w{a abbr acronym address area b base bdo HTML_TAGS = Set.new %w{a abbr address area article aside
big blockquote body br button caption cite code audio b base bdo blockquote body br button canvas caption
col colgroup dd del dfn div dl DOCTYPE cite code col colgroup command datalist dd del details dfn
dt em fieldset form h1 h2 h3 h4 h5 h6 head html hr div dl dt em embed fieldset figure footer form h1 h2 h3
i img input ins kbd label legend li h4 h5 h6 head header hgroup hr html i iframe img input ins
link visited hover before after kbd keygen label legend li link map mark menu meta meter
map meta noscript object ol optgroup option nav noscript object ol optgroup option output p param pre
p param pre q samp script select small progress q rp rt ruby samp script section select small
span strong style sub sup table tbody td source span strong style sub sup table tbody td textarea
textarea tfoot th thead title tr tt ul tfoot th thead time title tr ul var
var} unless const_defined?(:HTML401_TAGS) video} unless const_defined?(:HTML_TAGS)
MATHML_TAGS = Set.new %w{annotation annotation-xml maction
malign maligngroup malignmark malignscope math menclose
merror mfenced mfrac mglyph mi mlabeledtr mlongdiv mmultiscripts
mn mo mover mpadded mphantom mprescripts mroot mrow ms mscarries
mscarry msgroup msline mspace msqrt msrow mstack mstyle msub
msubsup msup mtable mtd mtext mtr munder munderover none
semantics} unless const_defined?(:MATHML_TAGS)
SVG_TAGS = Set.new %w{a altGlyph altGlyphDef altGlyphItem animate
animateColor animateMotion animateTransform circle clipPath
color-profile cursor definition-src defs desc ellipse feBlend
feColorMatrix feComponentTransfer feComposite feConvolveMatrix
feDiffuseLighting feDisplacementMap feDistantLight feFlood feFuncA
feFuncB feFuncG feFuncR feGaussianBlur feImage feMerge feMergeNode
feMorphology feOffset fePointLight feSpecularLighting feSpotLight
feTile feTurbulence filter font font-face font-face-format
font-face-name font-face-src font-face-uri foreignObject g glyph
glyphRef hkern image line linearGradient marker mask metadata
missing-glyph mpath path pattern polygon polyline radialGradient
rect script set stop style svg switch symbol text textPath title
tref tspan use view vkern} unless const_defined?(:SVG_TAGS)
MY_TAGS = HTML_TAGS + MATHML_TAGS + SVG_TAGS unless const_defined?(:MY_TAGS)
def setup def setup
@selector = true @selector = true
@ -202,7 +225,7 @@ module Syntax
start_group :uri, matched start_group :uri, matched
when @selector && scan(@tokens[:IDENT]) when @selector && scan(@tokens[:IDENT])
if HTML401_TAGS.include?( matched ) if MY_TAGS.include?( matched )
start_group :tag, matched start_group :tag, matched
else else
start_group :ident, matched start_group :ident, matched