diff -r f0d08bdeacf4 -r 6762afd9f963 ThirdParty/Pygments/pygments/lexers/css.py
--- a/ThirdParty/Pygments/pygments/lexers/css.py Sun Apr 23 16:40:31 2017 +0200
+++ b/ThirdParty/Pygments/pygments/lexers/css.py Tue Apr 25 18:36:38 2017 +0200
@@ -5,7 +5,7 @@
Lexers for CSS and related stylesheet formats.
- :copyright: Copyright 2006-2015 by the Pygments team, see AUTHORS.
+ :copyright: Copyright 2006-2017 by the Pygments team, see AUTHORS.
:license: BSD, see LICENSE for details.
"""
@@ -21,6 +21,251 @@
__all__ = ['CssLexer', 'SassLexer', 'ScssLexer', 'LessCssLexer']
+# List of vendor prefixes obtained from:
+# https://www.w3.org/TR/CSS21/syndata.html#vendor-keyword-history
+_vendor_prefixes = (
+ '-ms-', 'mso-', '-moz-', '-o-', '-xv-', '-atsc-', '-wap-', '-khtml-',
+ '-webkit-', 'prince-', '-ah-', '-hp-', '-ro-', '-rim-', '-tc-',
+)
+
+# List of CSS properties obtained from:
+# https://www.w3.org/Style/CSS/all-properties.en.html
+# Note: handle --* separately
+_css_properties = (
+ 'align-content', 'align-items', 'align-self', 'alignment-baseline', 'all',
+ 'animation', 'animation-delay', 'animation-direction',
+ 'animation-duration', 'animation-fill-mode', 'animation-iteration-count',
+ 'animation-name', 'animation-play-state', 'animation-timing-function',
+ 'appearance', 'azimuth', 'backface-visibility', 'background',
+ 'background-attachment', 'background-blend-mode', 'background-clip',
+ 'background-color', 'background-image', 'background-origin',
+ 'background-position', 'background-repeat', 'background-size',
+ 'baseline-shift', 'bookmark-label', 'bookmark-level', 'bookmark-state',
+ 'border', 'border-bottom', 'border-bottom-color',
+ 'border-bottom-left-radius', 'border-bottom-right-radius',
+ 'border-bottom-style', 'border-bottom-width', 'border-boundary',
+ 'border-collapse', 'border-color', 'border-image', 'border-image-outset',
+ 'border-image-repeat', 'border-image-slice', 'border-image-source',
+ 'border-image-width', 'border-left', 'border-left-color',
+ 'border-left-style', 'border-left-width', 'border-radius', 'border-right',
+ 'border-right-color', 'border-right-style', 'border-right-width',
+ 'border-spacing', 'border-style', 'border-top', 'border-top-color',
+ 'border-top-left-radius', 'border-top-right-radius', 'border-top-style',
+ 'border-top-width', 'border-width', 'bottom', 'box-decoration-break',
+ 'box-shadow', 'box-sizing', 'box-snap', 'box-suppress', 'break-after',
+ 'break-before', 'break-inside', 'caption-side', 'caret', 'caret-animation',
+ 'caret-color', 'caret-shape', 'chains', 'clear', 'clip', 'clip-path',
+ 'clip-rule', 'color', 'color-interpolation-filters', 'column-count',
+ 'column-fill', 'column-gap', 'column-rule', 'column-rule-color',
+ 'column-rule-style', 'column-rule-width', 'column-span', 'column-width',
+ 'columns', 'content', 'counter-increment', 'counter-reset', 'counter-set',
+ 'crop', 'cue', 'cue-after', 'cue-before', 'cursor', 'direction', 'display',
+ 'dominant-baseline', 'elevation', 'empty-cells', 'filter', 'flex',
+ 'flex-basis', 'flex-direction', 'flex-flow', 'flex-grow', 'flex-shrink',
+ 'flex-wrap', 'float', 'float-defer', 'float-offset', 'float-reference',
+ 'flood-color', 'flood-opacity', 'flow', 'flow-from', 'flow-into', 'font',
+ 'font-family', 'font-feature-settings', 'font-kerning',
+ 'font-language-override', 'font-size', 'font-size-adjust', 'font-stretch',
+ 'font-style', 'font-synthesis', 'font-variant', 'font-variant-alternates',
+ 'font-variant-caps', 'font-variant-east-asian', 'font-variant-ligatures',
+ 'font-variant-numeric', 'font-variant-position', 'font-weight',
+ 'footnote-display', 'footnote-policy', 'glyph-orientation-vertical',
+ 'grid', 'grid-area', 'grid-auto-columns', 'grid-auto-flow',
+ 'grid-auto-rows', 'grid-column', 'grid-column-end', 'grid-column-gap',
+ 'grid-column-start', 'grid-gap', 'grid-row', 'grid-row-end',
+ 'grid-row-gap', 'grid-row-start', 'grid-template', 'grid-template-areas',
+ 'grid-template-columns', 'grid-template-rows', 'hanging-punctuation',
+ 'height', 'hyphenate-character', 'hyphenate-limit-chars',
+ 'hyphenate-limit-last', 'hyphenate-limit-lines', 'hyphenate-limit-zone',
+ 'hyphens', 'image-orientation', 'image-resolution', 'initial-letter',
+ 'initial-letter-align', 'initial-letter-wrap', 'isolation',
+ 'justify-content', 'justify-items', 'justify-self', 'left',
+ 'letter-spacing', 'lighting-color', 'line-break', 'line-grid',
+ 'line-height', 'line-snap', 'list-style', 'list-style-image',
+ 'list-style-position', 'list-style-type', 'margin', 'margin-bottom',
+ 'margin-left', 'margin-right', 'margin-top', 'marker-side',
+ 'marquee-direction', 'marquee-loop', 'marquee-speed', 'marquee-style',
+ 'mask', 'mask-border', 'mask-border-mode', 'mask-border-outset',
+ 'mask-border-repeat', 'mask-border-slice', 'mask-border-source',
+ 'mask-border-width', 'mask-clip', 'mask-composite', 'mask-image',
+ 'mask-mode', 'mask-origin', 'mask-position', 'mask-repeat', 'mask-size',
+ 'mask-type', 'max-height', 'max-lines', 'max-width', 'min-height',
+ 'min-width', 'mix-blend-mode', 'motion', 'motion-offset', 'motion-path',
+ 'motion-rotation', 'move-to', 'nav-down', 'nav-left', 'nav-right',
+ 'nav-up', 'object-fit', 'object-position', 'offset-after', 'offset-before',
+ 'offset-end', 'offset-start', 'opacity', 'order', 'orphans', 'outline',
+ 'outline-color', 'outline-offset', 'outline-style', 'outline-width',
+ 'overflow', 'overflow-style', 'overflow-wrap', 'overflow-x', 'overflow-y',
+ 'padding', 'padding-bottom', 'padding-left', 'padding-right', 'padding-top',
+ 'page', 'page-break-after', 'page-break-before', 'page-break-inside',
+ 'page-policy', 'pause', 'pause-after', 'pause-before', 'perspective',
+ 'perspective-origin', 'pitch', 'pitch-range', 'play-during', 'polar-angle',
+ 'polar-distance', 'position', 'presentation-level', 'quotes',
+ 'region-fragment', 'resize', 'rest', 'rest-after', 'rest-before',
+ 'richness', 'right', 'rotation', 'rotation-point', 'ruby-align',
+ 'ruby-merge', 'ruby-position', 'running', 'scroll-snap-coordinate',
+ 'scroll-snap-destination', 'scroll-snap-points-x', 'scroll-snap-points-y',
+ 'scroll-snap-type', 'shape-image-threshold', 'shape-inside', 'shape-margin',
+ 'shape-outside', 'size', 'speak', 'speak-as', 'speak-header',
+ 'speak-numeral', 'speak-punctuation', 'speech-rate', 'stress', 'string-set',
+ 'tab-size', 'table-layout', 'text-align', 'text-align-last',
+ 'text-combine-upright', 'text-decoration', 'text-decoration-color',
+ 'text-decoration-line', 'text-decoration-skip', 'text-decoration-style',
+ 'text-emphasis', 'text-emphasis-color', 'text-emphasis-position',
+ 'text-emphasis-style', 'text-indent', 'text-justify', 'text-orientation',
+ 'text-overflow', 'text-shadow', 'text-space-collapse', 'text-space-trim',
+ 'text-spacing', 'text-transform', 'text-underline-position', 'text-wrap',
+ 'top', 'transform', 'transform-origin', 'transform-style', 'transition',
+ 'transition-delay', 'transition-duration', 'transition-property',
+ 'transition-timing-function', 'unicode-bidi', 'user-select',
+ 'vertical-align', 'visibility', 'voice-balance', 'voice-duration',
+ 'voice-family', 'voice-pitch', 'voice-range', 'voice-rate', 'voice-stress',
+ 'voice-volume', 'volume', 'white-space', 'widows', 'width', 'will-change',
+ 'word-break', 'word-spacing', 'word-wrap', 'wrap-after', 'wrap-before',
+ 'wrap-flow', 'wrap-inside', 'wrap-through', 'writing-mode', 'z-index',
+)
+
+# List of keyword values obtained from:
+# http://cssvalues.com/
+_keyword_values = (
+ 'absolute', 'alias', 'all', 'all-petite-caps', 'all-scroll',
+ 'all-small-caps', 'allow-end', 'alpha', 'alternate', 'alternate-reverse',
+ 'always', 'armenian', 'auto', 'avoid', 'avoid-column', 'avoid-page',
+ 'backwards', 'balance', 'baseline', 'below', 'blink', 'block', 'bold',
+ 'bolder', 'border-box', 'both', 'bottom', 'box-decoration', 'break-word',
+ 'capitalize', 'cell', 'center', 'circle', 'clip', 'clone', 'close-quote',
+ 'col-resize', 'collapse', 'color', 'color-burn', 'color-dodge', 'column',
+ 'column-reverse', 'compact', 'condensed', 'contain', 'container',
+ 'content-box', 'context-menu', 'copy', 'cover', 'crisp-edges', 'crosshair',
+ 'currentColor', 'cursive', 'darken', 'dashed', 'decimal',
+ 'decimal-leading-zero', 'default', 'descendants', 'difference', 'digits',
+ 'disc', 'distribute', 'dot', 'dotted', 'double', 'double-circle', 'e-resize',
+ 'each-line', 'ease', 'ease-in', 'ease-in-out', 'ease-out', 'edges',
+ 'ellipsis', 'end', 'ew-resize', 'exclusion', 'expanded', 'extra-condensed',
+ 'extra-expanded', 'fantasy', 'fill', 'fill-box', 'filled', 'first', 'fixed',
+ 'flat', 'flex', 'flex-end', 'flex-start', 'flip', 'force-end', 'forwards',
+ 'from-image', 'full-width', 'geometricPrecision', 'georgian', 'groove',
+ 'hanging', 'hard-light', 'help', 'hidden', 'hide', 'horizontal', 'hue',
+ 'icon', 'infinite', 'inherit', 'initial', 'ink', 'inline', 'inline-block',
+ 'inline-flex', 'inline-table', 'inset', 'inside', 'inter-word', 'invert',
+ 'isolate', 'italic', 'justify', 'large', 'larger', 'last', 'left',
+ 'lighten', 'lighter', 'line-through', 'linear', 'list-item', 'local',
+ 'loose', 'lower-alpha', 'lower-greek', 'lower-latin', 'lower-roman',
+ 'lowercase', 'ltr', 'luminance', 'luminosity', 'mandatory', 'manipulation',
+ 'manual', 'margin-box', 'match-parent', 'medium', 'mixed', 'monospace',
+ 'move', 'multiply', 'n-resize', 'ne-resize', 'nesw-resize',
+ 'no-close-quote', 'no-drop', 'no-open-quote', 'no-repeat', 'none', 'normal',
+ 'not-allowed', 'nowrap', 'ns-resize', 'nw-resize', 'nwse-resize', 'objects',
+ 'oblique', 'off', 'on', 'open', 'open-quote', 'optimizeLegibility',
+ 'optimizeSpeed', 'outset', 'outside', 'over', 'overlay', 'overline',
+ 'padding-box', 'page', 'pan-down', 'pan-left', 'pan-right', 'pan-up',
+ 'pan-x', 'pan-y', 'paused', 'petite-caps', 'pixelated', 'pointer',
+ 'preserve-3d', 'progress', 'proximity', 'relative', 'repeat',
+ 'repeat no-repeat', 'repeat-x', 'repeat-y', 'reverse', 'ridge', 'right',
+ 'round', 'row', 'row-resize', 'row-reverse', 'rtl', 'ruby', 'ruby-base',
+ 'ruby-base-container', 'ruby-text', 'ruby-text-container', 'run-in',
+ 'running', 's-resize', 'sans-serif', 'saturation', 'scale-down', 'screen',
+ 'scroll', 'se-resize', 'semi-condensed', 'semi-expanded', 'separate',
+ 'serif', 'sesame', 'show', 'sideways', 'sideways-left', 'sideways-right',
+ 'slice', 'small', 'small-caps', 'smaller', 'smooth', 'snap', 'soft-light',
+ 'solid', 'space', 'space-around', 'space-between', 'spaces', 'square',
+ 'start', 'static', 'step-end', 'step-start', 'sticky', 'stretch', 'strict',
+ 'stroke-box', 'style', 'sw-resize', 'table', 'table-caption', 'table-cell',
+ 'table-column', 'table-column-group', 'table-footer-group',
+ 'table-header-group', 'table-row', 'table-row-group', 'text', 'thick',
+ 'thin', 'titling-caps', 'to', 'top', 'triangle', 'ultra-condensed',
+ 'ultra-expanded', 'under', 'underline', 'unicase', 'unset', 'upper-alpha',
+ 'upper-latin', 'upper-roman', 'uppercase', 'upright', 'use-glyph-orientation',
+ 'vertical', 'vertical-text', 'view-box', 'visible', 'w-resize', 'wait',
+ 'wavy', 'weight', 'weight style', 'wrap', 'wrap-reverse', 'x-large',
+ 'x-small', 'xx-large', 'xx-small', 'zoom-in', 'zoom-out',
+)
+
+# List of extended color keywords obtained from:
+# https://drafts.csswg.org/css-color/#named-colors
+_color_keywords = (
+ 'aliceblue', 'antiquewhite', 'aqua', 'aquamarine', 'azure', 'beige',
+ 'bisque', 'black', 'blanchedalmond', 'blue', 'blueviolet', 'brown',
+ 'burlywood', 'cadetblue', 'chartreuse', 'chocolate', 'coral',
+ 'cornflowerblue', 'cornsilk', 'crimson', 'cyan', 'darkblue', 'darkcyan',
+ 'darkgoldenrod', 'darkgray', 'darkgreen', 'darkgrey', 'darkkhaki',
+ 'darkmagenta', 'darkolivegreen', 'darkorange', 'darkorchid', 'darkred',
+ 'darksalmon', 'darkseagreen', 'darkslateblue', 'darkslategray',
+ 'darkslategrey', 'darkturquoise', 'darkviolet', 'deeppink', 'deepskyblue',
+ 'dimgray', 'dimgrey', 'dodgerblue', 'firebrick', 'floralwhite',
+ 'forestgreen', 'fuchsia', 'gainsboro', 'ghostwhite', 'gold', 'goldenrod',
+ 'gray', 'green', 'greenyellow', 'grey', 'honeydew', 'hotpink', 'indianred',
+ 'indigo', 'ivory', 'khaki', 'lavender', 'lavenderblush', 'lawngreen',
+ 'lemonchiffon', 'lightblue', 'lightcoral', 'lightcyan',
+ 'lightgoldenrodyellow', 'lightgray', 'lightgreen', 'lightgrey',
+ 'lightpink', 'lightsalmon', 'lightseagreen', 'lightskyblue',
+ 'lightslategray', 'lightslategrey', 'lightsteelblue', 'lightyellow',
+ 'lime', 'limegreen', 'linen', 'magenta', 'maroon', 'mediumaquamarine',
+ 'mediumblue', 'mediumorchid', 'mediumpurple', 'mediumseagreen',
+ 'mediumslateblue', 'mediumspringgreen', 'mediumturquoise',
+ 'mediumvioletred', 'midnightblue', 'mintcream', 'mistyrose', 'moccasin',
+ 'navajowhite', 'navy', 'oldlace', 'olive', 'olivedrab', 'orange',
+ 'orangered', 'orchid', 'palegoldenrod', 'palegreen', 'paleturquoise',
+ 'palevioletred', 'papayawhip', 'peachpuff', 'peru', 'pink', 'plum',
+ 'powderblue', 'purple', 'rebeccapurple', 'red', 'rosybrown', 'royalblue',
+ 'saddlebrown', 'salmon', 'sandybrown', 'seagreen', 'seashell', 'sienna',
+ 'silver', 'skyblue', 'slateblue', 'slategray', 'slategrey', 'snow',
+ 'springgreen', 'steelblue', 'tan', 'teal', 'thistle', 'tomato', 'turquoise',
+ 'violet', 'wheat', 'white', 'whitesmoke', 'yellow', 'yellowgreen',
+) + ('transparent',)
+
+# List of other keyword values from other sources:
+_other_keyword_values = (
+ 'above', 'aural', 'behind', 'bidi-override', 'center-left', 'center-right',
+ 'cjk-ideographic', 'continuous', 'crop', 'cross', 'embed', 'far-left',
+ 'far-right', 'fast', 'faster', 'hebrew', 'high', 'higher', 'hiragana',
+ 'hiragana-iroha', 'katakana', 'katakana-iroha', 'landscape', 'left-side',
+ 'leftwards', 'level', 'loud', 'low', 'lower', 'message-box', 'middle',
+ 'mix', 'narrower', 'once', 'portrait', 'right-side', 'rightwards', 'silent',
+ 'slow', 'slower', 'small-caption', 'soft', 'spell-out', 'status-bar',
+ 'super', 'text-bottom', 'text-top', 'wider', 'x-fast', 'x-high', 'x-loud',
+ 'x-low', 'x-soft', 'yes', 'pre', 'pre-wrap', 'pre-line',
+)
+
+# List of functional notation and function keyword values:
+_functional_notation_keyword_values = (
+ 'attr', 'blackness', 'blend', 'blenda', 'blur', 'brightness', 'calc',
+ 'circle', 'color-mod', 'contrast', 'counter', 'cubic-bezier', 'device-cmyk',
+ 'drop-shadow', 'ellipse', 'gray', 'grayscale', 'hsl', 'hsla', 'hue',
+ 'hue-rotate', 'hwb', 'image', 'inset', 'invert', 'lightness',
+ 'linear-gradient', 'matrix', 'matrix3d', 'opacity', 'perspective',
+ 'polygon', 'radial-gradient', 'rect', 'repeating-linear-gradient',
+ 'repeating-radial-gradient', 'rgb', 'rgba', 'rotate', 'rotate3d', 'rotateX',
+ 'rotateY', 'rotateZ', 'saturate', 'saturation', 'scale', 'scale3d',
+ 'scaleX', 'scaleY', 'scaleZ', 'sepia', 'shade', 'skewX', 'skewY', 'steps',
+ 'tint', 'toggle', 'translate', 'translate3d', 'translateX', 'translateY',
+ 'translateZ', 'whiteness',
+)
+# Note! Handle url(...) separately.
+
+# List of units obtained from:
+# https://www.w3.org/TR/css3-values/
+_angle_units = (
+ 'deg', 'grad', 'rad', 'turn',
+)
+_frequency_units = (
+ 'Hz', 'kHz',
+)
+_length_units = (
+ 'em', 'ex', 'ch', 'rem',
+ 'vh', 'vw', 'vmin', 'vmax',
+ 'px', 'mm', 'cm', 'in', 'pt', 'pc', 'q',
+)
+_resolution_units = (
+ 'dpi', 'dpcm', 'dppx',
+)
+_time_units = (
+ 's', 'ms',
+)
+_all_units = _angle_units + _frequency_units + _length_units + \
+ _resolution_units + _time_units
+
+
class CssLexer(RegexLexer):
"""
For CSS (Cascading Style Sheets).
@@ -39,10 +284,10 @@
(r'\s+', Text),
(r'/\*(?:.|\n)*?\*/', Comment),
(r'\{', Punctuation, 'content'),
- (r'\:[\w-]+', Name.Decorator),
- (r'\.[\w-]+', Name.Class),
- (r'\#[\w-]+', Name.Namespace),
- (r'@[\w-]+', Keyword, 'atrule'),
+ (r'(\:{1,2})([\w-]+)', bygroups(Punctuation, Name.Decorator)),
+ (r'(\.)([\w-]+)', bygroups(Punctuation, Name.Class)),
+ (r'(\#)([\w-]+)', bygroups(Punctuation, Name.Namespace)),
+ (r'(@)([\w-]+)', bygroups(Punctuation, Keyword), 'atrule'),
(r'[\w-]+', Name.Tag),
(r'[~^*!%&$\[\]()<>|+=@:;,./?-]', Operator),
(r'"(\\\\|\\"|[^"])*"', String.Double),
@@ -60,107 +305,81 @@
'content': [
(r'\s+', Text),
(r'\}', Punctuation, '#pop'),
- (r'url\(.*?\)', String.Other),
+ (r';', Punctuation),
(r'^@.*?$', Comment.Preproc),
- (words((
- 'azimuth', 'background-attachment', 'background-color',
- 'background-image', 'background-position', 'background-repeat',
- 'background', 'border-bottom-color', 'border-bottom-style',
- 'border-bottom-width', 'border-left-color', 'border-left-style',
- 'border-left-width', 'border-right', 'border-right-color',
- 'border-right-style', 'border-right-width', 'border-top-color',
- 'border-top-style', 'border-top-width', 'border-bottom',
- 'border-collapse', 'border-left', 'border-width', 'border-color',
- 'border-spacing', 'border-style', 'border-top', 'border', 'caption-side',
- 'clear', 'clip', 'color', 'content', 'counter-increment', 'counter-reset',
- 'cue-after', 'cue-before', 'cue', 'cursor', 'direction', 'display',
- 'elevation', 'empty-cells', 'float', 'font-family', 'font-size',
- 'font-size-adjust', 'font-stretch', 'font-style', 'font-variant',
- 'font-weight', 'font', 'height', 'letter-spacing', 'line-height',
- 'list-style-type', 'list-style-image', 'list-style-position',
- 'list-style', 'margin-bottom', 'margin-left', 'margin-right',
- 'margin-top', 'margin', 'marker-offset', 'marks', 'max-height', 'max-width',
- 'min-height', 'min-width', 'opacity', 'orphans', 'outline-color',
- 'outline-style', 'outline-width', 'outline', 'overflow', 'overflow-x',
- 'overflow-y', 'padding-bottom', 'padding-left', 'padding-right', 'padding-top',
- 'padding', 'page', 'page-break-after', 'page-break-before', 'page-break-inside',
- 'pause-after', 'pause-before', 'pause', 'pitch-range', 'pitch',
- 'play-during', 'position', 'quotes', 'richness', 'right', 'size',
- 'speak-header', 'speak-numeral', 'speak-punctuation', 'speak',
- 'speech-rate', 'stress', 'table-layout', 'text-align', 'text-decoration',
- 'text-indent', 'text-shadow', 'text-transform', 'top', 'unicode-bidi',
- 'vertical-align', 'visibility', 'voice-family', 'volume', 'white-space',
- 'widows', 'width', 'word-spacing', 'z-index', 'bottom',
- 'above', 'absolute', 'always', 'armenian', 'aural', 'auto', 'avoid', 'baseline',
- 'behind', 'below', 'bidi-override', 'blink', 'block', 'bolder', 'bold', 'both',
- 'capitalize', 'center-left', 'center-right', 'center', 'circle',
- 'cjk-ideographic', 'close-quote', 'collapse', 'condensed', 'continuous',
- 'crop', 'crosshair', 'cross', 'cursive', 'dashed', 'decimal-leading-zero',
- 'decimal', 'default', 'digits', 'disc', 'dotted', 'double', 'e-resize', 'embed',
- 'extra-condensed', 'extra-expanded', 'expanded', 'fantasy', 'far-left',
- 'far-right', 'faster', 'fast', 'fixed', 'georgian', 'groove', 'hebrew', 'help',
- 'hidden', 'hide', 'higher', 'high', 'hiragana-iroha', 'hiragana', 'icon',
- 'inherit', 'inline-table', 'inline', 'inset', 'inside', 'invert', 'italic',
- 'justify', 'katakana-iroha', 'katakana', 'landscape', 'larger', 'large',
- 'left-side', 'leftwards', 'left', 'level', 'lighter', 'line-through', 'list-item',
- 'loud', 'lower-alpha', 'lower-greek', 'lower-roman', 'lowercase', 'ltr',
- 'lower', 'low', 'medium', 'message-box', 'middle', 'mix', 'monospace',
- 'n-resize', 'narrower', 'ne-resize', 'no-close-quote', 'no-open-quote',
- 'no-repeat', 'none', 'normal', 'nowrap', 'nw-resize', 'oblique', 'once',
- 'open-quote', 'outset', 'outside', 'overline', 'pointer', 'portrait', 'px',
- 'relative', 'repeat-x', 'repeat-y', 'repeat', 'rgb', 'ridge', 'right-side',
- 'rightwards', 's-resize', 'sans-serif', 'scroll', 'se-resize',
- 'semi-condensed', 'semi-expanded', 'separate', 'serif', 'show', 'silent',
- 'slower', 'slow', 'small-caps', 'small-caption', 'smaller', 'soft', 'solid',
- 'spell-out', 'square', 'static', 'status-bar', 'super', 'sw-resize',
- 'table-caption', 'table-cell', 'table-column', 'table-column-group',
- 'table-footer-group', 'table-header-group', 'table-row',
- 'table-row-group', 'text-bottom', 'text-top', 'text', 'thick', 'thin',
- 'transparent', 'ultra-condensed', 'ultra-expanded', 'underline',
- 'upper-alpha', 'upper-latin', 'upper-roman', 'uppercase', 'url',
- 'visible', 'w-resize', 'wait', 'wider', 'x-fast', 'x-high', 'x-large', 'x-loud',
- 'x-low', 'x-small', 'x-soft', 'xx-large', 'xx-small', 'yes'), suffix=r'\b'),
- Name.Builtin),
- (words((
- 'indigo', 'gold', 'firebrick', 'indianred', 'yellow', 'darkolivegreen',
- 'darkseagreen', 'mediumvioletred', 'mediumorchid', 'chartreuse',
- 'mediumslateblue', 'black', 'springgreen', 'crimson', 'lightsalmon', 'brown',
- 'turquoise', 'olivedrab', 'cyan', 'silver', 'skyblue', 'gray', 'darkturquoise',
- 'goldenrod', 'darkgreen', 'darkviolet', 'darkgray', 'lightpink', 'teal',
- 'darkmagenta', 'lightgoldenrodyellow', 'lavender', 'yellowgreen', 'thistle',
- 'violet', 'navy', 'orchid', 'blue', 'ghostwhite', 'honeydew', 'cornflowerblue',
- 'darkblue', 'darkkhaki', 'mediumpurple', 'cornsilk', 'red', 'bisque', 'slategray',
- 'darkcyan', 'khaki', 'wheat', 'deepskyblue', 'darkred', 'steelblue', 'aliceblue',
- 'gainsboro', 'mediumturquoise', 'floralwhite', 'coral', 'purple', 'lightgrey',
- 'lightcyan', 'darksalmon', 'beige', 'azure', 'lightsteelblue', 'oldlace',
- 'greenyellow', 'royalblue', 'lightseagreen', 'mistyrose', 'sienna',
- 'lightcoral', 'orangered', 'navajowhite', 'lime', 'palegreen', 'burlywood',
- 'seashell', 'mediumspringgreen', 'fuchsia', 'papayawhip', 'blanchedalmond',
- 'peru', 'aquamarine', 'white', 'darkslategray', 'ivory', 'dodgerblue',
- 'lemonchiffon', 'chocolate', 'orange', 'forestgreen', 'slateblue', 'olive',
- 'mintcream', 'antiquewhite', 'darkorange', 'cadetblue', 'moccasin',
- 'limegreen', 'saddlebrown', 'darkslateblue', 'lightskyblue', 'deeppink',
- 'plum', 'aqua', 'darkgoldenrod', 'maroon', 'sandybrown', 'magenta', 'tan',
- 'rosybrown', 'pink', 'lightblue', 'palevioletred', 'mediumseagreen',
- 'dimgray', 'powderblue', 'seagreen', 'snow', 'mediumblue', 'midnightblue',
- 'paleturquoise', 'palegoldenrod', 'whitesmoke', 'darkorchid', 'salmon',
- 'lightslategray', 'lawngreen', 'lightgreen', 'tomato', 'hotpink',
- 'lightyellow', 'lavenderblush', 'linen', 'mediumaquamarine', 'green',
- 'blueviolet', 'peachpuff'), suffix=r'\b'),
- Name.Builtin),
+
+ (words(_vendor_prefixes,), Keyword.Pseudo),
+ (r'('+r'|'.join(_css_properties)+r')(\s*)(\:)',
+ bygroups(Keyword, Text, Punctuation), 'value-start'),
+ (r'([a-zA-Z_][\w-]*)(\s*)(\:)', bygroups(Name, Text, Punctuation),
+ 'value-start'),
+
+ (r'/\*(?:.|\n)*?\*/', Comment),
+ ],
+ 'value-start': [
+ (r'\s+', Text),
+ (words(_vendor_prefixes,), Name.Builtin.Pseudo),
+ include('urls'),
+ (r'('+r'|'.join(_functional_notation_keyword_values)+r')(\()',
+ bygroups(Name.Builtin, Punctuation), 'function-start'),
+ (r'([a-zA-Z_][\w-]+)(\()', bygroups(Name.Function, Punctuation), 'function-start'),
+ (words(_keyword_values, suffix=r'\b'), Keyword.Constant),
+ (words(_other_keyword_values, suffix=r'\b'), Keyword.Constant),
+ (words(_color_keywords, suffix=r'\b'), Keyword.Constant),
+ (words(_css_properties, suffix=r'\b'), Keyword), # for transition-property etc.
(r'\!important', Comment.Preproc),
(r'/\*(?:.|\n)*?\*/', Comment),
- (r'\#[a-zA-Z0-9]{1,6}', Number),
- (r'[.-]?[0-9]*[.]?[0-9]+(em|px|pt|pc|in|mm|cm|ex|s)\b', Number),
- # Separate regex for percentages, as can't do word boundaries with %
- (r'[.-]?[0-9]*[.]?[0-9]+%', Number),
- (r'-?[0-9]+', Number),
- (r'[~^*!%&<>|+=@:,./?-]+', Operator),
- (r'[\[\]();]+', Punctuation),
+
+ include('numeric-values'),
+
+ (r'[~^*!%&<>|+=@:./?-]+', Operator),
+ (r'[\[\](),]+', Punctuation),
(r'"(\\\\|\\"|[^"])*"', String.Double),
(r"'(\\\\|\\'|[^'])*'", String.Single),
- (r'[a-zA-Z_]\w*', Name)
- ]
+ (r'[a-zA-Z_][\w-]*', Name),
+ (r';', Punctuation, '#pop'),
+ (r'\}', Punctuation, '#pop:2'),
+ ],
+ 'function-start': [
+ (r'\s+', Text),
+ include('urls'),
+ (words(_vendor_prefixes,), Keyword.Pseudo),
+ (words(_keyword_values, suffix=r'\b'), Keyword.Constant),
+ (words(_other_keyword_values, suffix=r'\b'), Keyword.Constant),
+ (words(_color_keywords, suffix=r'\b'), Keyword.Constant),
+
+ # function-start may be entered recursively
+ (r'(' + r'|'.join(_functional_notation_keyword_values) + r')(\()',
+ bygroups(Name.Builtin, Punctuation), 'function-start'),
+ (r'([a-zA-Z_][\w-]+)(\()', bygroups(Name.Function, Punctuation), 'function-start'),
+
+ (r'/\*(?:.|\n)*?\*/', Comment),
+ include('numeric-values'),
+ (r'[*+/-]', Operator),
+ (r'[,]', Punctuation),
+ (r'"(\\\\|\\"|[^"])*"', String.Double),
+ (r"'(\\\\|\\'|[^'])*'", String.Single),
+ (r'[a-zA-Z_-]\w*', Name),
+ (r'\)', Punctuation, '#pop'),
+ ],
+ 'urls': [
+ (r'(url)(\()(".*?")(\))', bygroups(Name.Builtin, Punctuation,
+ String.Double, Punctuation)),
+ (r"(url)(\()('.*?')(\))", bygroups(Name.Builtin, Punctuation,
+ String.Single, Punctuation)),
+ (r'(url)(\()(.*?)(\))', bygroups(Name.Builtin, Punctuation,
+ String.Other, Punctuation)),
+ ],
+ 'numeric-values': [
+ (r'\#[a-zA-Z0-9]{1,6}', Number.Hex),
+ (r'[+\-]?[0-9]*[.][0-9]+', Number.Float, 'numeric-end'),
+ (r'[+\-]?[0-9]+', Number.Integer, 'numeric-end'),
+ ],
+ 'numeric-end': [
+ (words(_all_units, suffix=r'\b'), Keyword.Type),
+ (r'%', Keyword.Type),
+ default('#pop'),
+ ],
}
@@ -170,35 +389,7 @@
(r'[!$][\w-]+', Name.Variable),
(r'url\(', String.Other, 'string-url'),
(r'[a-z_-][\w-]*(?=\()', Name.Function),
- (words((
- 'azimuth', 'background-attachment', 'background-color',
- 'background-image', 'background-position', 'background-repeat',
- 'background', 'border-bottom-color', 'border-bottom-style',
- 'border-bottom-width', 'border-left-color', 'border-left-style',
- 'border-left-width', 'border-right', 'border-right-color',
- 'border-right-style', 'border-right-width', 'border-top-color',
- 'border-top-style', 'border-top-width', 'border-bottom',
- 'border-collapse', 'border-left', 'border-width', 'border-color',
- 'border-spacing', 'border-style', 'border-top', 'border', 'caption-side',
- 'clear', 'clip', 'color', 'content', 'counter-increment', 'counter-reset',
- 'cue-after', 'cue-before', 'cue', 'cursor', 'direction', 'display',
- 'elevation', 'empty-cells', 'float', 'font-family', 'font-size',
- 'font-size-adjust', 'font-stretch', 'font-style', 'font-variant',
- 'font-weight', 'font', 'height', 'letter-spacing', 'line-height',
- 'list-style-type', 'list-style-image', 'list-style-position',
- 'list-style', 'margin-bottom', 'margin-left', 'margin-right',
- 'margin-top', 'margin', 'marker-offset', 'marks', 'max-height', 'max-width',
- 'min-height', 'min-width', 'opacity', 'orphans', 'outline', 'outline-color',
- 'outline-style', 'outline-width', 'overflow', 'padding-bottom',
- 'padding-left', 'padding-right', 'padding-top', 'padding', 'page',
- 'page-break-after', 'page-break-before', 'page-break-inside',
- 'pause-after', 'pause-before', 'pause', 'pitch', 'pitch-range',
- 'play-during', 'position', 'quotes', 'richness', 'right', 'size',
- 'speak-header', 'speak-numeral', 'speak-punctuation', 'speak',
- 'speech-rate', 'stress', 'table-layout', 'text-align', 'text-decoration',
- 'text-indent', 'text-shadow', 'text-transform', 'top', 'unicode-bidi',
- 'vertical-align', 'visibility', 'voice-family', 'volume', 'white-space',
- 'widows', 'width', 'word-spacing', 'z-index', 'bottom', 'left',
+ (words(_css_properties + (
'above', 'absolute', 'always', 'armenian', 'aural', 'auto', 'avoid', 'baseline',
'behind', 'below', 'bidi-override', 'blink', 'block', 'bold', 'bolder', 'both',
'capitalize', 'center-left', 'center-right', 'center', 'circle',
@@ -229,33 +420,7 @@
'visible', 'w-resize', 'wait', 'wider', 'x-fast', 'x-high', 'x-large', 'x-loud',
'x-low', 'x-small', 'x-soft', 'xx-large', 'xx-small', 'yes'), suffix=r'\b'),
Name.Constant),
- (words((
- 'indigo', 'gold', 'firebrick', 'indianred', 'darkolivegreen',
- 'darkseagreen', 'mediumvioletred', 'mediumorchid', 'chartreuse',
- 'mediumslateblue', 'springgreen', 'crimson', 'lightsalmon', 'brown',
- 'turquoise', 'olivedrab', 'cyan', 'skyblue', 'darkturquoise',
- 'goldenrod', 'darkgreen', 'darkviolet', 'darkgray', 'lightpink',
- 'darkmagenta', 'lightgoldenrodyellow', 'lavender', 'yellowgreen', 'thistle',
- 'violet', 'orchid', 'ghostwhite', 'honeydew', 'cornflowerblue',
- 'darkblue', 'darkkhaki', 'mediumpurple', 'cornsilk', 'bisque', 'slategray',
- 'darkcyan', 'khaki', 'wheat', 'deepskyblue', 'darkred', 'steelblue', 'aliceblue',
- 'gainsboro', 'mediumturquoise', 'floralwhite', 'coral', 'lightgrey',
- 'lightcyan', 'darksalmon', 'beige', 'azure', 'lightsteelblue', 'oldlace',
- 'greenyellow', 'royalblue', 'lightseagreen', 'mistyrose', 'sienna',
- 'lightcoral', 'orangered', 'navajowhite', 'palegreen', 'burlywood',
- 'seashell', 'mediumspringgreen', 'papayawhip', 'blanchedalmond',
- 'peru', 'aquamarine', 'darkslategray', 'ivory', 'dodgerblue',
- 'lemonchiffon', 'chocolate', 'orange', 'forestgreen', 'slateblue',
- 'mintcream', 'antiquewhite', 'darkorange', 'cadetblue', 'moccasin',
- 'limegreen', 'saddlebrown', 'darkslateblue', 'lightskyblue', 'deeppink',
- 'plum', 'darkgoldenrod', 'sandybrown', 'magenta', 'tan',
- 'rosybrown', 'pink', 'lightblue', 'palevioletred', 'mediumseagreen',
- 'dimgray', 'powderblue', 'seagreen', 'snow', 'mediumblue', 'midnightblue',
- 'paleturquoise', 'palegoldenrod', 'whitesmoke', 'darkorchid', 'salmon',
- 'lightslategray', 'lawngreen', 'lightgreen', 'tomato', 'hotpink',
- 'lightyellow', 'lavenderblush', 'linen', 'mediumaquamarine',
- 'blueviolet', 'peachpuff'), suffix=r'\b'),
- Name.Entity),
+ (words(_color_keywords, suffix=r'\b'), Name.Entity),
(words((
'black', 'silver', 'gray', 'white', 'maroon', 'red', 'purple', 'fuchsia', 'green',
'lime', 'olive', 'yellow', 'navy', 'blue', 'teal', 'aqua'), suffix=r'\b'),
@@ -476,8 +641,8 @@
(r'@[\w-]+', Keyword, 'selector'),
(r'(\$[\w-]*\w)([ \t]*:)', bygroups(Name.Variable, Operator), 'value'),
# TODO: broken, and prone to infinite loops.
- #(r'(?=[^;{}][;}])', Name.Attribute, 'attr'),
- #(r'(?=[^;{}:]+:[^a-z])', Name.Attribute, 'attr'),
+ # (r'(?=[^;{}][;}])', Name.Attribute, 'attr'),
+ # (r'(?=[^;{}:]+:[^a-z])', Name.Attribute, 'attr'),
default('selector'),
],
@@ -518,7 +683,7 @@
inherit,
],
'content': [
- (r'{', Punctuation, '#push'),
+ (r'\{', Punctuation, '#push'),
inherit,
],
}
