Menu
▾
▴
[clr-ci] SF.net SVN: colorer:[1866] branches/lazyeugene/hrc
|
From: <laz...@us...> - 2012-07-21 11:10:43
|
Revision: 1866
http://colorer.svn.sourceforge.net/colorer/?rev=1866&view=rev
Author: lazyeugene
Date: 2012-07-21 11:10:34 +0000 (Sat, 21 Jul 2012)
Log Message:
-----------
Many changes in html and css schemes: some bugfixes, some simplifies.
Some constants were added to php scheme.
Modified Paths:
--------------
branches/lazyeugene/hrc/hrc/inet/css.hrc
branches/lazyeugene/hrc/hrc/inet/html-css.hrc
branches/lazyeugene/hrc/hrc/inet/html.hrc
branches/lazyeugene/hrc/hrc/inet/less.hrc
branches/lazyeugene/hrc/hrc/proto.hrc
branches/lazyeugene/hrc/hrc/proto.hrc.far
branches/lazyeugene/hrc/src/php/src/php.lst
branches/lazyeugene/hrc/test/_valid/cf/dsntree.cfm.html
branches/lazyeugene/hrc/test/_valid/cf/full/myform.cfm.html
branches/lazyeugene/hrc/test/_valid/cpp/full/colorer.cpp.html
branches/lazyeugene/hrc/test/_valid/html/colorer.css.html
branches/lazyeugene/hrc/test/_valid/html/full/menu.css.html
branches/lazyeugene/hrc/test/_valid/html/less/test.less.html
branches/lazyeugene/hrc/test/_valid/html/sass/mixins.sass.html
branches/lazyeugene/hrc/test/_valid/html/test.css.html
branches/lazyeugene/hrc/test/_valid/php/full/php._xfulllist.php.html
branches/lazyeugene/hrc/test/_valid/php/full/php.new.php.html
Modified: branches/lazyeugene/hrc/hrc/inet/css.hrc
===================================================================
--- branches/lazyeugene/hrc/hrc/inet/css.hrc 2012-06-16 15:00:20 UTC (rev 1865)
+++ branches/lazyeugene/hrc/hrc/inet/css.hrc 2012-07-21 11:10:34 UTC (rev 1866)
@@ -52,11 +52,15 @@
<region name="PseudoElement" parent="def:Keyword" />
<region name="PseudoElementUnknown" parent="default" />
<region name="PseudoClassUnknown" parent="default" />
+ <region name="DeprecatedPseudoClass" parent="def:DeprecatedKeyword"/>
+ <region name="DeprecatedPseudoElement" parent="def:DeprecatedKeyword"/>
<region name="PropertyName" parent="def:KeywordStrong" />
<region name="PropertyFunc" parent="def:FunctionKeyword" />
<region name="PropertyValue" parent="def:Parameter" />
<region name="ImportantValue" parent="def:Keyword" />
+ <region name="DeprecatedPropertyFunc" parent="def:DeprecatedKeyword"/>
+ <region name="DeprecatedPropertyName" parent="def:DeprecatedKeyword"/>
<region name="RuleOutline" parent="def:Outlined"/>
<region name="DirectiveOutline" parent="def:Outlined"/>
@@ -135,8 +139,242 @@
</keywords>
</scheme>
-
- <scheme name="PropertyNames">
+ <scheme name="PropertyNames">
+ <keywords region="DeprecatedPropertyName" ignorecase="yes" worddiv='%worddiv-class;'>
+ <word name="-khtml-border-bottom-left-radius"/>
+ <word name="-khtml-border-bottom-right-radius"/>
+ <word name="-khtml-border-radius"/>
+ <word name="-khtml-border-top-left-radius"/>
+ <word name="-khtml-border-top-right-radius"/>
+ <word name="-khtml-opacity"/>
+ </keywords>
+ <keywords region="DeprecatedPropertyName" ignorecase="yes" worddiv='%worddiv-class;'>
+ <word name="-moz-animation-delay" />
+ <word name="-moz-animation-direction" />
+ <word name="-moz-animation-duration" />
+ <word name="-moz-animation-fill-mode" />
+ <word name="-moz-animation-iteration-count" />
+ <word name="-moz-animation-name" />
+ <word name="-moz-animation-play-state" />
+ <word name="-moz-animation-timing-function" />
+ <word name="-moz-animation"/>
+ <word name="-moz-appearance" />
+ <word name="-moz-backface-visibility" />
+ <word name="-moz-background-clip"/>
+ <word name="-moz-background-inline-policy"/>
+ <word name="-moz-background-origin"/>
+ <word name="-moz-background-size"/>
+ <word name="-moz-binding"/>
+ <word name="-moz-border-bottom-colors"/>
+ <word name="-moz-border-colors"/>
+ <word name="-moz-border-end-color"/>
+ <word name="-moz-border-end-style"/>
+ <word name="-moz-border-end-width"/>
+ <word name="-moz-border-end"/>
+ <word name="-moz-border-image-outset" />
+ <word name="-moz-border-image-repeat" />
+ <word name="-moz-border-image-slice" />
+ <word name="-moz-border-image-source" />
+ <word name="-moz-border-image-width" />
+ <word name="-moz-border-image" />
+ <word name="-moz-border-left-colors"/>
+ <word name="-moz-border-radius-bottomleft"/>
+ <word name="-moz-border-radius-bottomright"/>
+ <word name="-moz-border-radius-topleft"/>
+ <word name="-moz-border-radius-topright"/>
+ <word name="-moz-border-radius"/>
+ <word name="-moz-border-right-colors"/>
+ <word name="-moz-border-start-color"/>
+ <word name="-moz-border-start-style"/>
+ <word name="-moz-border-start-width"/>
+ <word name="-moz-border-start"/>
+ <word name="-moz-border-top-colors"/>
+ <word name="-moz-box-align"/>
+ <word name="-moz-box-direction"/>
+ <word name="-moz-box-flex"/>
+ <word name="-moz-box-flexgroup"/>
+ <word name="-moz-box-ordinal-group"/>
+ <word name="-moz-box-orient"/>
+ <word name="-moz-box-pack"/>
+ <word name="-moz-box-shadow"/>
+ <word name="-moz-box-sizing"/>
+ <word name="-moz-column-count"/>
+ <word name="-moz-column-fill"/>
+ <word name="-moz-column-gap"/>
+ <word name="-moz-column-rule-color" />
+ <word name="-moz-column-rule-style" />
+ <word name="-moz-column-rule-width" />
+ <word name="-moz-column-rule" />
+ <word name="-moz-column-width" />
+ <word name="-moz-columns" />
+ <word name="-moz-filter" />
+ <word name="-moz-float-edge" />
+ <word name="-moz-font-feature-settings" />
+ <word name="-moz-font-language-override" />
+ <word name="-moz-force-broken-image-icon" />
+ <word name="-moz-hyphens" />
+ <word name="-moz-image-region"/>
+ <word name="-moz-key-equivalent"/>
+ <word name="-moz-margin-end"/>
+ <word name="-moz-margin-start"/>
+ <word name="-moz-mask" />
+ <word name="-moz-opacity"/>
+ <word name="-moz-orient"/>
+ <word name="-moz-outline-color"/>
+ <word name="-moz-outline-offset" />
+ <word name="-moz-outline-radius-bottomleft"/>
+ <word name="-moz-outline-radius-bottomright"/>
+ <word name="-moz-outline-radius-topleft"/>
+ <word name="-moz-outline-radius-topright"/>
+ <word name="-moz-outline-radius"/>
+ <word name="-moz-outline-style"/>
+ <word name="-moz-outline-width"/>
+ <word name="-moz-outline"/>
+ <word name="-moz-padding-end" />
+ <word name="-moz-padding-start" />
+ <word name="-moz-perspective-origin" />
+ <word name="-moz-perspective" />
+ <word name="-moz-script-level" />
+ <word name="-moz-script-min-size" />
+ <word name="-moz-script-size-multiplier" />
+ <word name="-moz-stack-sizing" />
+ <word name="-moz-tab-size" />
+ <word name="-moz-text-align-last" />
+ <word name="-moz-text-blink" />
+ <word name="-moz-text-decoration-color" />
+ <word name="-moz-text-decoration-line" />
+ <word name="-moz-text-decoration-style" />
+ <word name="-moz-text-size-adjust" />
+ <word name="-moz-transform-origin" />
+ <word name="-moz-transform-style" />
+ <word name="-moz-transform" />
+ <word name="-moz-transition-delay" />
+ <word name="-moz-transition-duration" />
+ <word name="-moz-transition-property" />
+ <word name="-moz-transition-timing-function" />
+ <word name="-moz-transition" />
+ <word name="-moz-user-focus"/>
+ <word name="-moz-user-input"/>
+ <word name="-moz-user-modify" />
+ <word name="-moz-user-select"/>
+ <word name="-moz-window-shadow"/>
+ </keywords>
+ <keywords region="DeprecatedPropertyName" ignorecase="yes" worddiv='%worddiv-class;'>
+ <word name="behavior"/>
+ <word name="filter"/>
+ <word name="layout-flow"/>
+ <word name="layout-grid-char"/>
+ <word name="layout-grid-line"/>
+ <word name="layout-grid-type"/>
+ <word name="layout-grid-mode"/>
+ <word name="text-autospace"/>
+ <word name="text-justify"/>
+ <word name="text-kashida-space"/>
+ <word name="text-underline-position"/>
+ <word name="word-break"/>
+ <word name="word-wrap"/>
+ <word name="writing-mode"/>
+ <word name="zoom"/>
+ <word name="line-break"/>
+ <word name="ruby-overhang"/>
+ <word name="ruby-position"/>
+ <word name="scrollbar-3dlight-color"/>
+ <word name="scrollbar-arrow-color"/>
+ <word name="scrollbar-base-color"/>
+ <word name="scrollbar-darkshadow-color"/>
+ <word name="scrollbar-face-color"/>
+ <word name="scrollbar-highlight-color"/>
+ <word name="scrollbar-shadow-color"/>
+ <word name="-ms-accelerator" />
+ <word name="-ms-background-position-x" />
+ <word name="-ms-background-position-y" />
+ <word name="-ms-behavior" />
+ <word name="-ms-block-progression" />
+ <word name="-ms-box-sizing"/>
+ <word name="-ms-filter" />
+ <word name="-ms-ime-mode" />
+ <word name="-ms-interpolation-mode" />
+ <word name="-ms-layout-grid-char" />
+ <word name="-ms-layout-grid-line" />
+ <word name="-ms-layout-grid-mode" />
+ <word name="-ms-layout-grid-type" />
+ <word name="-ms-layout-grid" />
+ <word name="-ms-line-break" />
+ <word name="-ms-line-grid-mode" />
+ <word name="-ms-overflow-x" />
+ <word name="-ms-overflow-y" />
+ <word name="-ms-scrollbar-3dlight-color" />
+ <word name="-ms-scrollbar-arrow-color" />
+ <word name="-ms-scrollbar-base-color" />
+ <word name="-ms-scrollbar-darkshadow-color" />
+ <word name="-ms-scrollbar-face-color" />
+ <word name="-ms-scrollbar-highlight-color" />
+ <word name="-ms-scrollbar-shadow-color" />
+ <word name="-ms-scrollbar-track-color" />
+ <word name="-ms-text-align-last" />
+ <word name="-ms-text-autospace" />
+ <word name="-ms-text-justify" />
+ <word name="-ms-text-kashida-space" />
+ <word name="-ms-text-overflow" />
+ <word name="-ms-text-size-adjust"/>
+ <word name="-ms-text-underline-position" />
+ <word name="-ms-transform"/>
+ <word name="-ms-transition"/>
+ <word name="-ms-word-break" />
+ <word name="-ms-word-wrap" />
+ <word name="-ms-writing-mode" />
+ <word name="-ms-zoom" />
+ </keywords>
+ <keywords region="DeprecatedPropertyName" ignorecase="yes" worddiv='%worddiv-class;'>
+ <word name="-o-background-size"/>
+ <word name="-o-border-image"/>
+ <word name="-o-device-pixel-ratio"/>
+ <word name="-o-focus-opacity"/>
+ <word name="-o-link"/>
+ <word name="-o-link-source"/>
+ <word name="-o-mini-fold"/>
+ <word name="-o-object-fit"/>
+ <word name="-o-object-position"/>
+ <word name="-o-tab-size"/>
+ <word name="-o-table-baseline"/>
+ <word name="-o-text-overflow"/>
+ <word name="-o-transform-origin"/>
+ <word name="-o-transform"/>
+ <word name="-o-transition-delay"/>
+ <word name="-o-transition-duration"/>
+ <word name="-o-transition-property"/>
+ <word name="-o-transition-timing-function"/>
+ <word name="-o-transition"/>
+ <word name="-o-user-select"/>
+ </keywords>
+ <keywords region="DeprecatedPropertyName" ignorecase="yes" worddiv='%worddiv-class;'>
+ <word name="-pie-background"/>
+ </keywords>
+ <keywords region="DeprecatedPropertyName" ignorecase="yes" worddiv='%worddiv-class;'>
+ <word name="-webkit-animation"/>
+ <word name="-webkit-appearance"/>
+ <word name="-webkit-background-clip"/>
+ <word name="-webkit-background-origin"/>
+ <word name="-webkit-background-size"/>
+ <word name="-webkit-border-bottom-left-radius"/>
+ <word name="-webkit-border-bottom-right-radius"/>
+ <word name="-webkit-border-top-left-radius"/>
+ <word name="-webkit-border-top-right-radius"/>
+ <word name="-webkit-border-radius"/>
+ <word name="-webkit-box-shadow"/>
+ <word name="-webkit-box-sizing"/>
+ <word name="-webkit-column-count"/>
+ <word name="-webkit-column-gap"/>
+ <word name="-webkit-column-rule"/>
+ <word name="-webkit-column-width"/>
+ <word name="-webkit-columns"/>
+ <word name="-webkit-margin-top-collapse"/>
+ <word name="-webkit-text-size-adjust"/>
+ <word name="-webkit-transform"/>
+ <word name="-webkit-transition"/>
+ <word name="-webkit-user-select"/>
+ </keywords>
+
<keywords region="PropertyName" ignorecase="yes" worddiv='%worddiv-class;'>
<word name="ACCELERATOR"/>
<word name="animation"/>
@@ -363,7 +601,7 @@
</scheme>
<scheme name="NumericArc">
- <regexp match="/([+\-])?[\d\.]+ (deg|g?rad)?\M\b/x"
+ <regexp match="/([+\-])?[\d\.]+ (deg|g?rad|turn)?\M\b/x"
region0="Number" region1="def:Symbol" region2="UnitSuffix"/>
</scheme>
<scheme name="NumericArcLst">
@@ -455,20 +693,23 @@
<scheme name="CssFunctions">
- <keywords region="PropertyFunc" ignorecase="yes">
+ <keywords region="DeprecatedPropertyFunc" ignorecase="yes">
+ <word name="-moz-linear-gradient"/>
+ <word name="-moz-radial-gradient"/>
<word name="-ms-linear-gradient"/>
- <word name="-moz-linear-gradient"/>
+ <word name="-ms-radial-gradient"/>
<word name="-o-linear-gradient"/>
+ <word name="-o-radial-gradient"/>
<word name="-webkit-gradient"/>
<word name="-webkit-linear-gradient"/>
- <word name="-ms-radial-gradient"/>
- <word name="-moz-radial-gradient"/>
<word name="-webkit-radial-gradient"/>
-
+ </keywords>
+ <keywords region="PropertyFunc" ignorecase="yes">
<word name="attr"/>
<word name="hsl"/>
<word name="hsla"/>
<word name="linear-gradient"/>
+ <word name="radial-gradient"/>
<word name="rect"/>
<word name="rgb"/>
<word name="rgba"/>
@@ -809,6 +1050,10 @@
</scheme>
<scheme name="PseudoClass">
+ <keywords region="DeprecatedPseudoClass">
+ <word name="-moz-placeholder" />
+ <word name="-webkit-autofill" />
+ </keywords>
<keywords region="PseudoClass">
<word name="active"/>
<word name="after"/>
@@ -848,23 +1093,22 @@
<word name="target"/>
<word name="valid"/>
<word name="visited"/>
-
- <word name="-moz-placeholder" />
</keywords>
</scheme>
<scheme name="PseudoElement">
+ <keywords region="DeprecatedPseudoElement">
+ <word name="-moz-focus-inner"/>
+ <word name="-webkit-input-placeholder"/>
+ <word name="-webkit-search-cancel-button"/>
+ <word name="-webkit-search-decoration"/>
+ </keywords>
<keywords region="PseudoElement">
<word name="after"/>
<word name="before"/>
<word name="first-letter"/>
<word name="first-line"/>
<word name="selection"/>
-
- <word name="-moz-focus-inner"/>
- <word name="-webkit-input-placeholder"/>
- <word name="-webkit-search-cancel-button"/>
- <word name="-webkit-search-decoration"/>
</keywords>
</scheme>
@@ -992,7 +1236,7 @@
region01="SymbolStrong" region02="Directive"
scheme="MozDocument"
/>
- <block start="/(\@)((-webkit-|-moz-)?keyframes)\s*([\w\-]+)\s*((\{))/" end="/(\})/"
+ <block start="/(\@)((-webkit-|-moz-|-o-)?keyframes)\s*([\w\-]+)\s*((\{))/" end="/(\})/"
region01="SymbolStrong" region02="Directive" region04="String" region05="SymbolStrong" region06="PairStart"
region10="SymbolStrong" region11="PairEnd"
scheme="Animation"
Modified: branches/lazyeugene/hrc/hrc/inet/html-css.hrc
===================================================================
--- branches/lazyeugene/hrc/hrc/inet/html-css.hrc 2012-06-16 15:00:20 UTC (rev 1865)
+++ branches/lazyeugene/hrc/hrc/inet/html-css.hrc 2012-07-21 11:10:34 UTC (rev 1866)
@@ -39,21 +39,10 @@
<type name="html-css">
-<region name="msie" parent="def:DeprecatedKeyword"/>
-<region name="mozilla" parent="def:DeprecatedKeyword"/>
-<region name="opera" parent="def:DeprecatedKeyword"/>
-<region name="webkit" parent="def:DeprecatedKeyword"/>
-<region name="khtml" parent="def:DeprecatedKeyword"/>
-
<region name="PropertyValue" parent="def:Parameter"/>
<scheme name="PropertyNames">
<inherit scheme="css:PropertyNames"/>
- <inherit scheme="mzPropertyNames"/>
- <inherit scheme="iePropertyNames"/>
- <inherit scheme="webkitPropertyNames"/>
- <inherit scheme="oPropertyNames"/>
- <inherit scheme="khtmlPropertyNames"/>
</scheme>
<scheme name="PropertyValue">
@@ -64,97 +53,7 @@
</scheme>
-<scheme name="mzPropertyNames" if="moz-css">
- <keywords region="mozilla" ignorecase="yes" worddiv='%css:worddiv-class;'>
- <word name="-moz-animation"/>
- <word name="-moz-animation-delay" />
- <word name="-moz-animation-direction" />
- <word name="-moz-animation-duration" />
- <word name="-moz-animation-fill-mode" />
- <word name="-moz-animation-iteration-count" />
- <word name="-moz-animation-name" />
- <word name="-moz-animation-play-state" />
- <word name="-moz-animation-timing-function" />
- <word name="-moz-appearance" />
- <word name="-moz-backface-visibility" />
- <word name="-moz-background-clip"/>
- <word name="-moz-background-inline-policy"/>
- <word name="-moz-background-origin"/>
- <word name="-moz-background-size"/>
- <word name="-moz-binding"/>
- <word name="-moz-border-bottom-colors"/>
- <word name="-moz-border-colors"/>
- <word name="-moz-border-image-outset" />
- <word name="-moz-border-image-repeat" />
- <word name="-moz-border-image-slice" />
- <word name="-moz-border-image-source" />
- <word name="-moz-border-image-width" />
- <word name="-moz-border-image" />
- <word name="-moz-border-left-colors"/>
- <word name="-moz-border-radius-bottomleft"/>
- <word name="-moz-border-radius-bottomright"/>
- <word name="-moz-border-radius-topleft"/>
- <word name="-moz-border-radius-topright"/>
- <word name="-moz-border-radius"/>
- <word name="-moz-border-right-colors"/>
- <word name="-moz-border-top-colors"/>
- <word name="-moz-box-align"/>
- <word name="-moz-box-direction"/>
- <word name="-moz-box-flex"/>
- <word name="-moz-box-flexgroup"/>
- <word name="-moz-box-orient"/>
- <word name="-moz-box-pack"/>
- <word name="-moz-box-shadow"/>
- <word name="-moz-box-sizing"/>
- <word name="-moz-column-count"/>
- <word name="-moz-column-gap"/>
- <word name="-moz-column-rule-color" />
- <word name="-moz-column-rule-style" />
- <word name="-moz-column-rule-width" />
- <word name="-moz-column-rule" />
- <word name="-moz-column-width" />
- <word name="-moz-columns" />
- <word name="-moz-filter" />
- <word name="-moz-font-feature-settings" />
- <word name="-moz-font-language-override" />
- <word name="-moz-hyphens" />
- <word name="-moz-mask" />
- <word name="-moz-image-region"/>
- <word name="-moz-key-equivalent"/>
- <word name="-moz-opacity"/>
- <word name="-moz-orient"/>
- <word name="-moz-outline-radius-bottomleft"/>
- <word name="-moz-outline-radius-bottomright"/>
- <word name="-moz-outline-radius-topleft"/>
- <word name="-moz-outline-radius-topright"/>
- <word name="-moz-outline-radius"/>
- <word name="-moz-outline-color"/>
- <word name="-moz-outline-offset" />
- <word name="-moz-outline-style"/>
- <word name="-moz-outline-width"/>
- <word name="-moz-outline"/>
- <word name="-moz-perspective" />
- <word name="-moz-perspective-origin" />
- <word name="-moz-text-align-last" />
- <word name="-moz-text-decoration-color" />
- <word name="-moz-text-decoration-line" />
- <word name="-moz-text-decoration-style" />
- <word name="-moz-transform" />
- <word name="-moz-transform-origin" />
- <word name="-moz-transform-style" />
- <word name="-moz-transition" />
- <word name="-moz-transition-delay" />
- <word name="-moz-transition-duration" />
- <word name="-moz-transition-property" />
- <word name="-moz-transition-timing-function" />
- <word name="-moz-user-focus"/>
- <word name="-moz-user-input"/>
- <word name="-moz-user-modify" />
- <word name="-moz-user-select"/>
- </keywords>
-</scheme>
-
-<scheme name="mzPropertyValue" if="moz-css">
+<scheme name="mzPropertyValue">
<keywords region="PropertyValue" ignorecase="yes" worddiv='%css:worddiv-class;'>
<word name="border"/>
<word name="padding"/>
@@ -192,136 +91,13 @@
</scheme>
-<scheme name="iePropertyNames" if="ie-css">
- <keywords region="msie" ignorecase="yes" worddiv='%css:worddiv-class;'>
- <word name="behavior"/>
- <word name="filter"/>
- <word name="layout-flow"/>
- <word name="layout-grid-char"/>
- <word name="layout-grid-line"/>
- <word name="layout-grid-type"/>
- <word name="layout-grid-mode"/>
- <word name="text-autospace"/>
- <word name="text-justify"/>
- <word name="text-kashida-space"/>
- <word name="text-underline-position"/>
- <word name="word-break"/>
- <word name="word-wrap"/>
- <word name="writing-mode"/>
- <word name="zoom"/>
- <word name="line-break"/>
- <word name="ruby-overhang"/>
- <word name="ruby-position"/>
- <word name="scrollbar-3dlight-color"/>
- <word name="scrollbar-arrow-color"/>
- <word name="scrollbar-base-color"/>
- <word name="scrollbar-darkshadow-color"/>
- <word name="scrollbar-face-color"/>
- <word name="scrollbar-highlight-color"/>
- <word name="scrollbar-shadow-color"/>
-
-
- <word name="-ms-accelerator" />
- <word name="-ms-background-position-x" />
- <word name="-ms-background-position-y" />
- <word name="-ms-behavior" />
- <word name="-ms-block-progression" />
- <word name="-ms-box-sizing"/>
- <word name="-ms-filter" />
- <word name="-ms-ime-mode" />
- <word name="-ms-interpolation-mode" />
- <word name="-ms-layout-grid-char" />
- <word name="-ms-layout-grid-line" />
- <word name="-ms-layout-grid-mode" />
- <word name="-ms-layout-grid-type" />
- <word name="-ms-layout-grid" />
- <word name="-ms-line-break" />
- <word name="-ms-line-grid-mode" />
- <word name="-ms-overflow-x" />
- <word name="-ms-overflow-y" />
- <word name="-ms-scrollbar-3dlight-color" />
- <word name="-ms-scrollbar-arrow-color" />
- <word name="-ms-scrollbar-base-color" />
- <word name="-ms-scrollbar-darkshadow-color" />
- <word name="-ms-scrollbar-face-color" />
- <word name="-ms-scrollbar-highlight-color" />
- <word name="-ms-scrollbar-shadow-color" />
- <word name="-ms-scrollbar-track-color" />
- <word name="-ms-text-align-last" />
- <word name="-ms-text-autospace" />
- <word name="-ms-text-justify" />
- <word name="-ms-text-kashida-space" />
- <word name="-ms-text-overflow" />
- <word name="-ms-text-size-adjust"/>
- <word name="-ms-text-underline-position" />
- <word name="-ms-transform"/>
- <word name="-ms-transition"/>
- <word name="-ms-word-break" />
- <word name="-ms-word-wrap" />
- <word name="-ms-writing-mode" />
- <word name="-ms-zoom" />
- </keywords>
-</scheme>
-
-<scheme name="iePropertyValue" if="ie-css">
+<scheme name="iePropertyValue">
<keywords region="PropertyValue" ignorecase="yes" worddiv='%css:worddiv-class;'>
<word name="bicubic"/>
</keywords>
</scheme>
-<scheme name="oPropertyNames" if="opera-css">
- <keywords region="opera" ignorecase="yes" worddiv='%css:worddiv-class;'>
- <word name="-o-background-size"/>
- <word name="-o-border-image"/>
- <word name="-o-device-pixel-ratio"/>
- <word name="-o-focus-opacity"/>
- <word name="-o-link"/>
- <word name="-o-link-source"/>
- <word name="-o-mini-fold"/>
- <word name="-o-object-fit"/>
- <word name="-o-object-position"/>
- <word name="-o-tab-size"/>
- <word name="-o-table-baseline"/>
- <word name="-o-text-overflow"/>
- <word name="-o-transform-origin"/>
- <word name="-o-transform"/>
- <word name="-o-transition-delay"/>
- <word name="-o-transition-duration"/>
- <word name="-o-transition-property"/>
- <word name="-o-transition-timing-function"/>
- <word name="-o-transition"/>
- <word name="-o-user-select"/>
- </keywords>
-</scheme>
-
-<scheme name="webkitPropertyNames" if="webkit-css">
- <keywords region="webkit" ignorecase="yes" worddiv='%css:worddiv-class;'>
- <word name="-webkit-animation"/>
- <word name="-webkit-appearance"/>
- <word name="-webkit-background-clip"/>
- <word name="-webkit-background-origin"/>
- <word name="-webkit-background-size"/>
- <word name="-webkit-border-bottom-left-radius"/>
- <word name="-webkit-border-bottom-right-radius"/>
- <word name="-webkit-border-top-left-radius"/>
- <word name="-webkit-border-top-right-radius"/>
- <word name="-webkit-border-radius"/>
- <word name="-webkit-box-shadow"/>
- <word name="-webkit-box-sizing"/>
- <word name="-webkit-column-count"/>
- <word name="-webkit-column-gap"/>
- <word name="-webkit-column-rule"/>
- <word name="-webkit-column-width"/>
- <word name="-webkit-columns"/>
- <word name="-webkit-margin-top-collapse"/>
- <word name="-webkit-text-size-adjust"/>
- <word name="-webkit-transform"/>
- <word name="-webkit-transition"/>
- <word name="-webkit-user-select"/>
- </keywords>
-</scheme>
-
-<scheme name="webkitPropertyValue" if="webkit-css">
+<scheme name="webkitPropertyValue">
<keywords region="PropertyValue" ignorecase="yes" worddiv='%css:worddiv-class;'>
<word name="button"/>
<word name="textfield"/>
@@ -330,18 +106,6 @@
</scheme>
-<scheme name="khtmlPropertyNames" if="khtml-css">
- <keywords region="khtml" ignorecase="yes" worddiv='%css:worddiv-class;'>
- <word name="-khtml-border-bottom-left-radius"/>
- <word name="-khtml-border-bottom-right-radius"/>
- <word name="-khtml-border-radius"/>
- <word name="-khtml-border-top-left-radius"/>
- <word name="-khtml-border-top-right-radius"/>
- <word name="-khtml-opacity"/>
- </keywords>
-</scheme>
-
-
<scheme name="cssTag">
<inherit scheme="html:htmlCoreTags"/>
</scheme>
@@ -355,7 +119,7 @@
</scheme>
-<scheme name="iePropertyFunc" if="ie-css">
+<scheme name="iePropertyFunc">
<block start="/\b(expression)(\s)*((\())/" end="/(\))/" scheme="jScript:jScript"
region01="msie" region03="def:PairStart" region04="css:Symbol"
region10="def:PairEnd" region11="css:Symbol"
Modified: branches/lazyeugene/hrc/hrc/inet/html.hrc
===================================================================
--- branches/lazyeugene/hrc/hrc/inet/html.hrc 2012-06-16 15:00:20 UTC (rev 1865)
+++ branches/lazyeugene/hrc/hrc/inet/html.hrc 2012-07-21 11:10:34 UTC (rev 1866)
@@ -99,329 +99,381 @@
<scheme name="htmlString"/>
- <scheme name="htmlCoreParams">
- <keywords ignorecase="yes" region="htmlParam">
- <word name="accesskey"/>
- <word name="action"/>
- <word name="class"/>
- <word name="classid"/>
- <word name="height"/>
- <word name="hidden"/>
- <word name="lang"/>
- <word name="language"/>
- <word name="left"/>
- <word name="leftmargin"/>
- <word name="method"/>
- <word name="name"/>
- <word name="onblur"/>
- <word name="onclick"/>
- <word name="ondblclick"/>
- <word name="ondragstart"/>
- <word name="onerrorupdate"/>
- <word name="onfilterchange"/>
- <word name="onfocus"/>
- <word name="onhelp"/>
- <word name="onkeydown"/>
- <word name="onkeypress"/>
- <word name="onkeyup"/>
- <word name="onmousedown"/>
- <word name="onmousemove"/>
- <word name="onmouseout"/>
- <word name="onmouseover"/>
- <word name="onmouseup"/>
- <word name="onselectstart"/>
- <word name="size"/>
- <word name="style"/>
- <word name="text"/>
- <word name="title"/>
- <word name="topmargin"/>
- <word name="width"/>
- <word name="z-index"/>
- </keywords>
- </scheme>
+ <scheme name="htmlParams">
+ <keywords ignorecase="yes" region="htmlParam">
+ <word name="abbr"/>
+ <word name="above"/>
+ <word name="accept-charset"/>
+ <word name="accept"/>
+ <word name="accesskey"/>
+ <word name="action"/>
+ <word name="align"/>
+ <word name="alink"/>
+ <word name="alt"/>
+ <word name="archive"/>
+ <word name="autocomplete"/>
+ <word name="axis"/>
+ <word name="background"/>
+ <word name="behavior"/>
+ <word name="below"/>
+ <word name="bgcolor"/>
+ <word name="border"/>
+ <word name="bordercolordark"/>
+ <word name="bordercolorlight"/>
+ <word name="cellpadding"/>
+ <word name="cellspacing"/>
+ <word name="challenge"/>
+ <word name="char"/>
+ <word name="charoff"/>
+ <word name="charset"/>
+ <word name="checked"/>
+ <word name="cite"/>
+ <word name="class"/>
+ <word name="classid"/>
+ <word name="clear"/>
+ <word name="code"/>
+ <word name="codebase"/>
+ <word name="codetype"/>
+ <word name="color"/>
+ <word name="cols"/>
+ <word name="colspan"/>
+ <word name="compact"/>
+ <word name="content"/>
+ <word name="contenteditable"/>
+ <word name="contextmenu"/>
+ <word name="controls"/>
+ <word name="coords"/>
+ <word name="data"/>
+ <word name="datafld"/>
+ <word name="dataformatas"/>
+ <word name="datapagesize"/>
+ <word name="datasrc"/>
+ <word name="datetime"/>
+ <word name="declare"/>
+ <word name="defer"/>
+ <word name="dir"/>
+ <word name="direction"/>
+ <word name="disabled"/>
+ <word name="draggable"/>
+ <word name="dropzone"/>
+ <word name="dynsrc"/>
+ <word name="enctype"/>
+ <word name="face"/>
+ <word name="for"/>
+ <word name="frame"/>
+ <word name="frameborder"/>
+ <word name="framespacing"/>
+ <word name="headers"/>
+ <word name="height"/>
+ <word name="hidden"/>
+ <word name="href"/>
+ <word name="hreflang"/>
+ <word name="hspace"/>
+ <word name="http-equiv"/>
+ <word name="id"/>
+ <word name="ismap"/>
+ <word name="label"/>
+ <word name="lang"/>
+ <word name="language"/>
+ <word name="left"/>
+ <word name="leftmargin"/>
+ <word name="link"/>
+ <word name="longdesc"/>
+ <word name="loop"/>
+ <word name="loopdelay"/>
+ <word name="mailto"/>
+ <word name="marginheight"/>
+ <word name="marginwidth"/>
+ <word name="maxlength"/>
+ <word name="media"/>
+ <word name="method"/>
+ <word name="multiple"/>
+ <word name="name"/>
+ <word name="nohref"/>
+ <word name="noresize"/>
+ <word name="noshade"/>
+ <word name="nowrap"/>
+ <word name="object"/>
+ <word name="onabort"/>
+ <word name="onafterprint"/>
+ <word name="onbeforeonload"/>
+ <word name="onbeforeprint"/>
+ <word name="onblur"/>
+ <word name="oncanplay"/>
+ <word name="oncanplaythrough"/>
+ <word name="onchange"/>
+ <word name="onclick"/>
+ <word name="oncontextmenu"/>
+ <word name="ondblclick"/>
+ <word name="ondrag"/>
+ <word name="ondragend"/>
+ <word name="ondragenter"/>
+ <word name="ondragleave"/>
+ <word name="ondragover"/>
+ <word name="ondragstart"/>
+ <word name="ondrop"/>
+ <word name="ondurationchange"/>
+ <word name="onemptied"/>
+ <word name="onended"/>
+ <word name="onerror"/>
+ <word name="onerrorupdate"/>
+ <word name="onfilterchange"/>
+ <word name="onfocus"/>
+ <word name="onformchange"/>
+ <word name="onforminput"/>
+ <word name="onhaschange"/>
+ <word name="onhelp"/>
+ <word name="oninput"/>
+ <word name="oninvalid"/>
+ <word name="onkeydown"/>
+ <word name="onkeypress"/>
+ <word name="onkeyup"/>
+ <word name="onload"/>
+ <word name="onloadeddata"/>
+ <word name="onloadedmetadata"/>
+ <word name="onloadstart"/>
+ <word name="onmessage"/>
+ <word name="onmousedown"/>
+ <word name="onmousemove"/>
+ <word name="onmouseout"/>
+ <word name="onmouseover"/>
+ <word name="onmouseup"/>
+ <word name="onmousewheel"/>
+ <word name="onoffline"/>
+ <word name="ononline"/>
+ <word name="onpagehide"/>
+ <word name="onpageshow"/>
+ <word name="onpause"/>
+ <word name="onplay"/>
+ <word name="onplaying"/>
+ <word name="onpopstate"/>
+ <word name="onprogress"/>
+ <word name="onratechange"/>
+ <word name="onreadystatechange"/>
+ <word name="onredo"/>
+ <word name="onreset"/>
+ <word name="onresize"/>
+ <word name="onscroll"/>
+ <word name="onseeked"/>
+ <word name="onseeking"/>
+ <word name="onselect"/>
+ <word name="onselectstart"/>
+ <word name="onstalled"/>
+ <word name="onstorage"/>
+ <word name="onsubmit"/>
+ <word name="onsuspend"/>
+ <word name="ontimeupdate"/>
+ <word name="onundo"/>
+ <word name="onunload"/>
+ <word name="onvolumechange"/>
+ <word name="onwaiting"/>
+ <word name="profile"/>
+ <word name="prompt"/>
+ <word name="readonly"/>
+ <word name="rel"/>
+ <word name="repeat"/>
+ <word name="required"/>
+ <word name="rev"/>
+ <word name="rows"/>
+ <word name="rowspan"/>
+ <word name="rules"/>
+ <word name="scheme"/>
+ <word name="scope"/>
+ <word name="scroll"/>
+ <word name="scrollamount"/>
+ <word name="scrolldelay"/>
+ <word name="scrolling"/>
+ <word name="selected"/>
+ <word name="shape"/>
+ <word name="size"/>
+ <word name="span"/>
+ <word name="spellcheck"/>
+ <word name="src"/>
+ <word name="standby"/>
+ <word name="start"/>
+ <word name="style"/>
+ <word name="summary"/>
+ <word name="tabindex"/>
+ <word name="target"/>
+ <word name="text"/>
+ <word name="title"/>
+ <word name="top"/>
+ <word name="topmargin"/>
+ <word name="truespeed"/>
+ <word name="type"/>
+ <word name="url"/>
+ <word name="usemap"/>
+ <word name="valign"/>
+ <word name="value"/>
+ <word name="valuetype"/>
+ <word name="version"/>
+ <word name="visibility"/>
+ <word name="vlink"/>
+ <word name="vrml"/>
+ <word name="vspace"/>
+ <word name="width"/>
+ <word name="z-index"/>
+ </keywords>
+ </scheme>
- <scheme name="htmlParams">
- <inherit scheme="htmlCoreParams"/>
- <keywords ignorecase="yes" region="htmlParam">
- <word name="abbr"/>
- <word name="above"/>
- <word name="accept-charset"/>
- <word name="accept"/>
- <word name="align"/>
- <word name="alink"/>
- <word name="alt"/>
- <word name="archive"/>
- <word name="axis"/>
- <word name="background"/>
- <word name="behavior"/>
- <word name="below"/>
- <word name="bgcolor"/>
- <word name="border"/>
- <word name="color"/>
- <word name="cellpadding"/>
- <word name="cellspacing"/>
- <word name="char"/>
- <word name="charoff"/>
- <word name="charset"/>
- <word name="checked"/>
- <word name="cite"/>
- <word name="clear"/>
- <word name="code"/>
- <word name="codebase"/>
- <word name="codetype"/>
- <word name="cols"/>
- <word name="dynsrc"/>
- <word name="loopdelay"/>
- <word name="vrml"/>
- <word name="controls"/>
- <word name="challenge"/>
- <word name="direction"/>
- <word name="scroll"/>
- <word name="scrollamount"/>
- <word name="scrolldelay"/>
- <word name="truespeed"/>
- <word name="datafld"/>
- <word name="dataformatas"/>
- <word name="datasrc"/>
- <word name="bordercolordark"/>
- <word name="bordercolorlight"/>
- <word name="datapagesize"/>
- <word name="colspan"/>
- <word name="compact"/>
- <word name="content"/>
- <word name="coords"/>
- <word name="data"/>
- <word name="datetime"/>
- <word name="declare"/>
- <word name="defer"/>
- <word name="dir"/>
- <word name="disabled"/>
- <word name="enctype"/>
- <word name="face"/>
- <word name="for"/>
- <word name="frame"/>
- <word name="frameborder"/>
- <word name="framespacing"/>
- <word name="headers"/>
- <word name="href"/>
- <word name="hreflang"/>
- <word name="hspace"/>
- <word name="http-equiv"/>
- <word name="id"/>
- <word name="ismap"/>
- <word name="label"/>
- <word name="link"/>
- <word name="loop"/>
- <word name="longdesc"/>
- <word name="mailto"/>
- <word name="marginheight"/>
- <word name="marginwidth"/>
- <word name="maxlength"/>
- <word name="media"/>
- <word name="multiple"/>
- <word name="nohref"/>
- <word name="noresize"/>
- <word name="noshade"/>
- <word name="nowrap"/>
- <word name="object"/>
- <word name="onload"/>
- <word name="onreset"/>
- <word name="onselect"/>
- <word name="onsubmit"/>
- <word name="onunload"/>
- <word name="profile"/>
- <word name="prompt"/>
- <word name="readonly"/>
- <word name="top"/>
- <word name="rel"/>
- <word name="required"/>
- <word name="rev"/>
- <word name="rows"/>
- <word name="rowspan"/>
- <word name="rules"/>
- <word name="scheme"/>
- <word name="scope"/>
- <word name="scrolling"/>
- <word name="scroll"/>
- <word name="selected"/>
- <word name="shape"/>
- <word name="span"/>
- <word name="src"/>
- <word name="standby"/>
- <word name="start"/>
- <word name="summary"/>
- <word name="tabindex"/>
- <word name="target"/>
- <word name="type"/>
- <word name="url"/>
- <word name="usemap"/>
- <word name="valign"/>
- <word name="value"/>
- <word name="valuetype"/>
- <word name="visibility"/>
- <word name="version"/>
- <word name="vlink"/>
- <word name="vspace"/>
-
- <word name="repeat"/>
- </keywords>
-
- </scheme>
+ <scheme name="htmlCoreTags">
+ <keywords ignorecase="yes" region="htmlOpenTag">
+ <word name="a"/>
+ </keywords>
+ <keywords ignorecase="yes" region="htmlOpenTag">
+ <!--word name="above"/-->
+ <!--word name="id"/-->
+ <!--word name="ilayer"/-->
+ <!--word name="layer"/-->
+ <!--word name="listing"/-->
+ <!--word name="multicol"/-->
+ <!--word name="nextid"/-->
+ <!--word name="nolayer"/-->
+ <word name="abbr"/>
+ <word name="acronym"/>
+ <word name="address"/>
+ <word name="applet"/>
+ <word name="area"/>
+ <word name="array"/>
+ <word name="article"/>
+ <word name="aside"/>
+ <word name="audio"/>
+ <word name="b"/>
+ <word name="base"/>
+ <word name="basefont"/>
+ <word name="bdi"/>
+ <word name="bdo"/>
+ <word name="bgsound"/>
+ <word name="big"/>
+ <word name="blink"/>
+ <word name="blink"/>
+ <word name="blockquote"/>
+ <word name="body"/>
+ <word name="box"/>
+ <word name="br"/>
+ <word name="button"/>
+ <word name="canvas"/>
+ <word name="caption"/>
+ <word name="center"/>
+ <word name="cite"/>
+ <word name="code"/>
+ <word name="col"/>
+ <word name="colgroup"/>
+ <word name="command"/>
+ <word name="comment"/>
+ <word name="datalist"/>
+ <word name="dd"/>
+ <word name="del"/>
+ <word name="details"/>
+ <word name="dfn"/>
+ <word name="dir"/>
+ <word name="div"/>
+ <word name="dl"/>
+ <word name="dt"/>
+ <word name="em"/>
+ <word name="embed"/>
+ <word name="fieldset"/>
+ <word name="fig"/>
+ <word name="figcaption"/>
+ <word name="figure"/>
+ <word name="font"/>
+ <word name="footer"/>
+ <word name="form"/>
+ <word name="frame"/>
+ <word name="frameset"/>
+ <word name="h1"/>
+ <word name="h2"/>
+ <word name="h3"/>
+ <word name="h4"/>
+ <word name="h5"/>
+ <word name="h6"/>
+ <word name="head"/>
+ <word name="header"/>
+ <word name="hgroup"/>
+ <word name="hr"/>
+ <word name="html"/>
+ <word name="i"/>
+ <word name="iframe"/>
+ <word name="img"/>
+ <word name="input"/>
+ <word name="ins"/>
+ <word name="isindex"/>
+ <word name="kbd"/>
+ <word name="keygen"/>
+ <word name="label"/>
+ <word name="legend"/>
+ <word name="li"/>
+ <word name="link"/>
+ <word name="map"/>
+ <word name="mark"/>
+ <word name="marquee"/>
+ <word name="menu"/>
+ <word name="meta"/>
+ <word name="meter"/>
+ <word name="nav"/>
+ <word name="nobr"/>
+ <word name="noembed"/>
+ <word name="noframes"/>
+ <word name="noscript"/>
+ <word name="note"/>
+ <word name="object"/>
+ <word name="ol"/>
+ <word name="optgroup"/>
+ <word name="option"/>
+ <word name="output"/>
+ <word name="p"/>
+ <word name="param"/>
+ <word name="pre"/>
+ <word name="progress"/>
+ <word name="q"/>
+ <word name="quote"/>
+ <word name="range"/>
+ <word name="root"/>
+ <word name="rp"/>
+ <word name="rt"/>
+ <word name="ruby"/>
+ <word name="s"/>
+ <word name="samp"/>
+ <word name="script"/>
+ <word name="section"/>
+ <word name="select"/>
+ <word name="small"/>
+ <word name="sound"/>
+ <word name="source"/>
+ <word name="spacer"/>
+ <word name="span"/>
+ <word name="sqrt"/>
+ <word name="strike"/>
+ <word name="strong"/>
+ <word name="style"/>
+ <word name="sub"/>
+ <word name="summary"/>
+ <word name="sup"/>
+ <word name="table"/>
+ <word name="tbody"/>
+ <word name="td"/>
+ <word name="text"/>
+ <word name="textarea"/>
+ <word name="tfoot"/>
+ <word name="th"/>
+ <word name="thead"/>
+ <word name="time"/>
+ <word name="title"/>
+ <word name="tr"/>
+ <word name="track"/>
+ <word name="tt"/>
+ <word name="u"/>
+ <word name="ul"/>
+ <word name="var"/>
+ <word name="video"/>
+ <word name="wbr"/>
+ <word name="xmp"/>
+ </keywords>
+ </scheme>
- <scheme name="htmlCoreTags">
- <keywords ignorecase="yes" region="htmlOpenTag">
- <word name="a"/>
- <word name="abbr"/>
- <!--word name="above"/-->
- <word name="acronym"/>
- <word name="address"/>
- <word name="applet"/>
- <word name="array"/>
- <word name="area"/>
- <word name="article"/>
- <word name="aside"/>
- <word name="audio"/>
- <word name="b"/>
- <word name="base"/>
- <word name="basefont"/>
- <word name="bdo"/>
- <word name="bgsound"/>
- <word name="big"/>
- <word name="blink"/>
- <word name="blockquote"/>
- <word name="body"/>
- <word name="box"/>
- <word name="br"/>
- <word name="blink"/>
- <word name="button"/>
- <word name="canvas"/>
- <word name="caption"/>
- <word name="center"/>
- <word name="cite"/>
- <word name="code"/>
- <word name="col"/>
- <word name="colgroup"/>
- <word name="command"/>
- <word name="comment"/>
- <word name="datalist"/>
- <word name="dd"/>
- <word name="del"/>
- <word name="details"/>
- <word name="dfn"/>
- <word name="dir"/>
- <word name="div"/>
- <word name="dl"/>
- <word name="dt"/>
- <word name="em"/>
- <word name="embed"/>
- <word name="fieldset"/>
- <word name="fig"/>
- <word name="figcaption"/>
- <word name="figure"/>
- <word name="font"/>
- <word name="form"/>
- <word name="footer"/>
- <word name="frame"/>
- <word name="frameset"/>
- <word name="h1"/>
- <word name="h2"/>
- <word name="h3"/>
- <word name="h4"/>
- <word name="h5"/>
- <word name="h6"/>
- <word name="head"/>
- <word name="header"/>
- <word name="hgroup"/>
- <word name="hr"/>
- <word name="html"/>
- <word name="i"/>
- <!--word name="id"/-->
- <word name="iframe"/>
- <!--word name="ilayer"/-->
- <word name="img"/>
- <word name="input"/>
- <word name="ins"/>
- <word name="isindex"/>
- <word name="kbd"/>
- <word name="keygen"/>
- <word name="label"/>
- <!--word name="layer"/-->
- <word name="legend"/>
- <word name="li"/>
- <word name="link"/>
- <!--word name="listing"/-->
- <word name="map"/>
- <word name="mark"/>
- <word name="marquee"/>
- <word name="menu"/>
- <word name="meta"/>
- <word name="meter"/>
- <!--word name="multicol"/-->
- <word name="nav"/>
- <!--word name="nextid"/-->
- <word name="nobr"/>
- <word name="noembed"/>
- <word name="noframes"/>
- <!--word name="nolayer"/-->
- <word name="note"/>
- <word name="noscript"/>
- <word name="object"/>
- <word name="ol"/>
- <word name="optgroup"/>
- <word name="option"/>
- <word name="output"/>
- <word name="p"/>
- <word name="param"/>
- <word name="pre"/>
- <word name="progress"/>
- <word name="q"/>
- <word name="quote"/>
- <word name="range"/>
- <word name="root"/>
- <word name="rp"/>
- <word name="rt"/>
- <word name="ruby"/>
- <word name="s"/>
- <word name="samp"/>
- <word name="script"/>
- <word name="section"/>
- <word name="select"/>
- <word name="small"/>
- <word name="sound"/>
- <word name="source"/>
- <word name="spacer"/>
- <word name="span"/>
- <word name="sqrt"/>
- <word name="strike"/>
- <word name="strong"/>
- <word name="style"/>
- <word name="sub"/>
- <word name="summary"/>
- <word name="sup"/>
- <word name="table"/>
- <word name="tbody"/>
- <word name="td"/>
- <word name="text"/>
- <word name="textarea"/>
- <word name="tfoot"/>
- <word name="th"/>
- <word name="thead"/>
- <word name="time"/>
- <word name="title"/>
- <word name="tr"/>
- <word name="tt"/>
- <word name="u"/>
- <word name="ul"/>
- <word name="var"/>
- <word name="video"/>
- <word name="wbr"/>
- <word name="xmp"/>
- </keywords>
- </scheme>
-
<scheme name="htmlCore">
<block start="/~/" end="/[^\w\:\-]?=/" scheme="htmlCoreTags" region="htmlUnknowTag"/>
-
+
<block start='/\b(style)(\s)*(\=)(\s)*((\"))/i' end='/(\")/' scheme="html-css:AposRuleContent"
region01="htmlParam" region03="htmlTagEqu" region05="def:PairStart"
region06="htmlString" region10="def:PairEnd" region11="htmlString"
Modified: branches/lazyeugene/hrc/hrc/inet/less.hrc
===================================================================
--- branches/lazyeugene/hrc/hrc/inet/less.hrc 2012-06-16 15:00:20 UTC (rev 1865)
+++ branches/lazyeugene/hrc/hrc/inet/less.hrc 2012-07-21 11:10:34 UTC (rev 1866)
@@ -141,21 +141,29 @@
</keywords>
</scheme>
+ <scheme name="MixingProperty">
+ <regexp match="/\.{3}[ \)]?=/" region="def:SymbolStrong" />
+ <inherit scheme="Property"/>
+ </scheme>
+
<scheme name="Mixing">
<regexp match="/((#[\w-]+\s*\>\s*)*\.[\w-]+)(\s*[\(;])?=/" region1="Mixing" region3="SymbolStrong" />
<block start="/(\()/" end="/(\))/"
- scheme="Property"
+ scheme="MixingProperty"
region00="PairStart" region01="def:Symbol"
region10="PairEnd" region11="Symbol"
/>
<regexp match="/\)?#1 \s* (when) \s* \(?=/x" region1="Keyword" />
+ <keywords ignorecase="yes" region="css:ImportantValue">
+ <word name="!important"/>
+ </keywords>
<keywords region="SymbolStrong">
<symb name=";"/>
</keywords>
</scheme>
<scheme name="Combinator">
- <regexp match="/&([.:])?=/" region="def:Keyword" />
+ <regexp match="/&/" region="def:Keyword" />
</scheme>
<scheme name="PropertyWrapper">
Modified: branches/lazyeugene/hrc/hrc/proto.hrc
===================================================================
--- branches/lazyeugene/hrc/hrc/proto.hrc 2012-06-16 15:00:20 UTC (rev 1865)
+++ branches/lazyeugene/hrc/hrc/proto.hrc 2012-07-21 11:10:34 UTC (rev 1866)
@@ -199,13 +199,13 @@
<prototype name="html-css" group="inet" description="css for html">
<location link="inet/html-css.hrc"/>
<filename weight="0">/\.(css)$/i</filename>
- <parameters>
+ <!--parameters>
<param name="ie-css" value="true" description="Use non-standard MSIE css extensions"/>
<param name="moz-css" value="true" description="Use non-standard Gecho-based css extensions"/>
<param name="opera-css" value="true" description="Use non-standard opera-based css extensions"/>
<param name="webkit-css" value="true" description="Use non-standard webkit-based css extensions"/>
<param name="khtml-css" value="true" description="Use non-standard khtml-based css extensions"/>
- </parameters>
+ </parameters-->
</prototype>
<prototype name="svg-css" group="inet" description="css for svg">
<location link="inet/svg-css.hrc"/>
Modified: branches/lazyeugene/hrc/hrc/proto.hrc.far
===================================================================
--- branches/lazyeugene/hrc/hrc/proto.hrc.far 2012-06-16 15:00:20 UTC (rev 1865)
+++ branches/lazyeugene/hrc/hrc/proto.hrc.far 2012-07-21 11:10:34 UTC (rev 1866)
@@ -202,13 +202,13 @@
<prototype name="html-css" group="inet" description="css for html">
<location link="inet/html-css.hrc"/>
<filename weight="0">/\.(css)$/i</filename>
- <parameters>
+ <!--parameters>
<param name="ie-css" value="true" description="Use non-standard MSIE css extensions"/>
<param name="moz-css" value="true" description="Use non-standard Gecho-based css extensions"/>
<param name="opera-css" value="true" description="Use non-standard opera-based css extensions"/>
<param name="webkit-css" value="true" description="Use non-standard webkit-based css extensions"/>
<param name="khtml-css" value="true" description="Use non-standard khtml-based css extensions"/>
- </parameters>
+ </parameters-->
</prototype>
<prototype name="svg-css" group="inet" description="css for svg">
<location link="inet/svg-css.hrc"/>
Modified: branches/lazyeugene/hrc/src/php/src/php.lst
===================================================================
--- branches/lazyeugene/hrc/src/php/src/php.lst 2012-06-16 15:00:20 UTC (rev 1865)
+++ branches/lazyeugene/hrc/src/php/src/php.lst 2012-07-21 11:10:34 UTC (rev 1866)
@@ -3093,12 +3093,14 @@
sys_getloadavg -- Gets system load average
time_nanosleep -- Delay for a number of seconds and nanoseconds
time_sleep_until -- Make the script sleep until the specified timeuniqid -- Generate a unique ID
+uniqid -- Generate a unique ID
unpack -- Unpack data from binary string
usleep -- Delay execution in microseconds
CONNECTION_ABORTED (integer)
CONNECTION_NORMAL (integer)
CONNECTION_TIMEOUT (integer)
+__COMPILER_HALT_OFFSET__ (integer)
<!-- LXII. mnoGoSearch Functions -->
udm_add_search_limit -- Add various search limits
@@ -5781,6 +5783,13 @@
ENT_COMPAT (integer)
ENT_QUOTES (integer)
ENT_NOQUOTES (integer)
+ENT_IGNORE (integer)
+ENT_SUBSTITUTE (integer)
+ENT_DISALLOWED (integer)
+ENT_HTML401 (integer)
+ENT_XML1 (integer)
+ENT_XHTML (integer)
+ENT_HTML5 (integer)
CHAR_MAX (integer)
LC_CTYPE (integer)
LC_NUMERIC (integer)
Modified: branches/lazyeugene/hrc/test/_valid/cf/dsntree.cfm.html
===================================================================
--- branches/lazyeugene/hrc/test/_valid/cf/dsntree.cfm.html 2012-06-16 15:00:20 UTC (rev 1865)
+++ branches/lazyeugene/hrc/test/_valid/cf/dsntree.cfm.html 2012-07-21 11:10:34 UTC (rev 1866)
@@ -116,9 +116,9 @@
115: <span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'> </span><span class='html-htmlParam def-Parameter'>topmargin</span><span class='html-htmlTagEqu def-Symbol'>=</span><span class='html-htmlString def-String'>"2"</span><span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'> </span>
116: <span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'> </span><span class='html-htmlParam def-Parameter'>class</span><span class='html-htmlTagEqu def-Symbol'>=</span><span class='html-htmlString def-String'>"mainbody"</span><span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'></span>
117: <span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'> </span><span class='html-htmlParam def-Parameter'>ondragstart</span><span class='html-htmlTagEqu def-Symbol'>=</span><span class='html-htmlString def-String'>"fOnDragStart()"</span><span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'></span>
-118: <span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'> onDragEnter</span><span class='html-htmlTagEqu def-Symbol'>=</span><span class='html-htmlString def-String'>"fOnDragOver()"</span><span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'></span>
-119: <span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'> onDragOver</span><span class='html-htmlTagEqu def-Symbol'>=</span><span class='html-htmlString def-String'>"fOnDragOver()"</span><span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'></span>
-120: <span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'> onDrop</span><span class='html-htmlTagEqu def-Symbol'>=</span><span class='html-htmlString def-String'>"fOnDrop()"</span><span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'></span>
+118: <span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'> </span><span class='html-htmlParam def-Parameter'>onDragEnter</span><span class='html-htmlTagEqu def-Symbol'>=</span><span class='html-htmlString def-String'>"fOnDragOver()"</span><span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'></span>
+119: <span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'> </span><span class='html-htmlParam def-Parameter'>onDragOver</span><span class='html-htmlTagEqu def-Symbol'>=</span><span class='html-htmlString def-String'>"fOnDragOver()"</span><span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'></span>
+120: <span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'> </span><span class='html-htmlParam def-Parameter'>onDrop</span><span class='html-htmlTagEqu def-Symbol'>=</span><span class='html-htmlString def-String'>"fOnDrop()"</span><span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'></span>
121: <span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'> </span><span class='html-htmlParam def-Parameter'>onKeyDown</span><span class='html-htmlTagEqu def-Symbol'>=</span><span class='html-htmlString def-String'>"fKeyDown()"</span><span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'></span>
122: <span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'> </span><span class='html-htmlParam def-Parameter'>onKeyUp</span><span class='html-htmlTagEqu def-Symbol'>=</span><span class='html-htmlString def-String'>"fKeyUp()"</span><span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'></span>
123: <span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'> </span><span class='html-htmlParam def-Parameter'>background</span><span class='html-htmlTagEqu def-Symbol'>=</span><span class='html-htmlString def-String'>"images/sql_bkg_stripe.gif"</span><span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'></span>
Modified: branches/lazyeugene/hrc/test/_valid/cf/full/myform.cfm.html
===================================================================
--- branches/lazyeugene/hrc/test/_valid/cf/full/myform.cfm.html 2012-06-16 15:00:20 UTC (rev 1865)
+++ branches/lazyeugene/hrc/test/_valid/cf/full/myform.cfm.html 2012-07-21 11:10:34 UTC (rev 1866)
@@ -26,7 +26,7 @@
25: <span class='html-htmlTagBr def-OpenTag def-Tag'><</span><span class='coldfusion-Tag def-Keyword'>CFLOOP</span><span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'> FROM</span><span class='html-htmlTagEqu def-Symbol'>=</span><span class='html-htmlString def-String'>"1"</span><span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'> TO</span><span class='html-htmlTagEqu def-Symbol'>=</span><span class='html-htmlString def-String'>"5"</span><span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'> index</span><span class='html-htmlTagEqu def-Symbol'>=</span><span class='html-htmlString def-String'>"i"</span><span class='html-htmlTagBr def-OpenTag def-Tag'>></span>
26: <span class='html-htmlTagBr def-OpenTag def-Tag'><</span><span class='html-htmlOpenTag def-Keyword'>tr</span><span class='html-htmlTagBr def-OpenTag def-Tag'>></span>
27: <span class='html-htmlTagBr def-OpenTag def-Tag'><</span><span class='html-htmlOpenTag def-Keyword'>td</span><span class='html-htmlTagBr def-OpenTag def-Tag'>></span>
-28: <span class='html-htmlTagBr def-OpenTag def-Tag'><</span><span class='coldfusion-Tag def-Keyword'>cfinput</span><span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'> </span><span class='html-htmlParam def-Parameter'>type</span><span class='html-htmlTagEqu def-Symbol'>=</span><span class='html-htmlString def-String'>"text"</span><span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'> </span><span class='html-htmlParam def-Parameter'>name</span><span class='html-htmlTagEqu def-Symbol'>=</span><span class='html-htmlString def-String'>"productid#i#"</span><span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'> </span><span class='html-htmlParam def-Parameter'>size</span><span class='html-htmlTagEqu def-Symbol'>=</span><span class='html-htmlString def-String'>"3"</span><span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'> validate</span><span class='html-htmlTagEqu def-Symbol'>=</span><span class='html-htmlString def-String'>"integer"</span><span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'> onChange</span><span class='html-htmlTagEqu def-Symbol'>=</span><span class='html-htmlString def-String'>"fnFindProduct(#i#,this.value)"</span><span class='html-htmlTagBr def-OpenTag def-Tag'>></span>
+28: <span class='html-htmlTagBr def-OpenTag def-Tag'><</span><span class='coldfusion-Tag def-Keyword'>cfinput</span><span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'> </span><span class='html-htmlParam def-Parameter'>type</span><span class='html-htmlTagEqu def-Symbol'>=</span><span class='html-htmlString def-String'>"text"</span><span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'> </span><span class='html-htmlParam def-Parameter'>name</span><span class='html-htmlTagEqu def-Symbol'>=</span><span class='html-htmlString def-String'>"productid#i#"</span><span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'> </span><span class='html-htmlParam def-Parameter'>size</span><span class='html-htmlTagEqu def-Symbol'>=</span><span class='html-htmlString def-String'>"3"</span><span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'> validate</span><span class='html-htmlTagEqu def-Symbol'>=</span><span class='html-htmlString def-String'>"integer"</span><span class='html-htmlUnknowParam def-ParameterUnknown def-ParameterStrong def-Parameter'> </span><span class='html-htmlParam def-Parameter'>onChange</span><span class='html-htmlTagEqu def-Symbol'>=</span><span class='html-htmlString def-String'>"fnFindProduct(#i#,this.value)"</span><span class='html-htmlTagBr def-OpenTag def-Tag'>></span>
29: <span class='html-htmlTagBr def-OpenTag def-Tag'></</span><span class='html-htmlCloseTag html-htmlOpenTag def-Keyword'>td</span><span class='html-htmlTagBr def-OpenTag def-Tag'>></span>
30: <span class='html-htmlTagBr def-OpenTag def-Tag'><</span><span class='html-htmlOpenTag def-Keyword'>td</span><span class='html-htmlTagBr def-OpenTag def-Tag'>></span>
31: <span class='html-htmlTagBr def-OpenTag def-Tag'><</span><span class='coldfusion-Tag def-Keyword'>CFOUTPUT</span><span class='html-htmlTagBr def-OpenTag def-Tag'>></span>
Modified: branches/lazyeugene...
[truncated message content] |