postcss-calc 10.0.1 → 10.1.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postcss-calc",
-  "version": "10.0.1",
+  "version": "10.1.0",
   "description": "PostCSS plugin to reduce calc()",
   "keywords": [
     "css",
@@ -21,31 +21,30 @@
     "types",
     "LICENSE"
   ],
-  "scripts": {
-    "prepare": "pnpm run build && tsc",
-    "build": "jison ./parser.jison -o src/parser.js",
-    "lint": "eslint . && tsc",
-    "test": "node --test"
-  },
   "author": "Andy Jansson",
   "license": "MIT",
   "engines": {
     "node": "^18.12 || ^20.9 || >=22.0"
   },
   "devDependencies": {
-    "@types/node": "^22.1.0",
-    "eslint": "^9.8.0",
+    "@types/node": "^22.10.2",
+    "eslint": "^9.17.0",
     "eslint-config-prettier": "^9.1.0",
     "jison-gho": "0.6.1-216",
-    "postcss": "^8.4.40",
-    "prettier": "^3.3.3",
-    "typescript": "~5.5.4"
+    "postcss": "^8.4.49",
+    "prettier": "^3.4.2",
+    "typescript": "~5.7.2"
   },
   "dependencies": {
-    "postcss-selector-parser": "^6.1.1",
+    "postcss-selector-parser": "^7.0.0",
     "postcss-value-parser": "^4.2.0"
   },
   "peerDependencies": {
     "postcss": "^8.4.38"
+  },
+  "scripts": {
+    "build": "jison ./parser.jison -o src/parser.js",
+    "lint": "eslint . && tsc",
+    "test": "node --test"
   }
-}
+}

package/src/lib/reducer.js

@@ -17,9 +17,29 @@ function isValueType(node) {
     case 'ChValue':
     case 'RemValue':
     case 'VhValue':
+    case 'SvhValue':
+    case 'LvhValue':
+    case 'DvhValue':
     case 'VwValue':
+    case 'SvwValue':
+    case 'LvwValue':
+    case 'DvwValue':
     case 'VminValue':
+    case 'SvminValue':
+    case 'LvminValue':
+    case 'DvminValue':
     case 'VmaxValue':
+    case 'SvmaxValue':
+    case 'LvmaxValue':
+    case 'DvmaxValue':
+    case 'VbValue':
+    case 'SvbValue':
+    case 'LvbValue':
+    case 'DvbValue':
+    case 'ViValue':
+    case 'SviValue':
+    case 'LviValue':
+    case 'DviValue':
     case 'CqwValue':
     case 'CqhValue':
     case 'CqiValue':
@@ -27,6 +47,8 @@ function isValueType(node) {
     case 'CqminValue':
     case 'CqmaxValue':
     case 'PercentageValue':
+    case 'LhValue':
+    case 'RlhValue':
     case 'Number':
       return true;
   }

package/src/lib/transform.js

@@ -7,7 +7,7 @@ const { parser } = require('../parser.js');
 const reducer = require('./reducer.js');
 const stringifier = require('./stringifier.js');
 
-const MATCH_CALC = /((?:-(moz|webkit)-)?calc)/i;
+const MATCH_CALC = /((?:-(moz|webkit)-)?calc(?!-))/i;
 
 /**
  * @param {string} value

package/src/parser.d.ts

@@ -23,15 +23,37 @@ export interface DimensionExpression {
     | 'ChValue'
     | 'RemValue'
     | 'VhValue'
+    | 'SvhValue'
+    | 'LvhValue'
+    | 'DvhValue'
     | 'VwValue'
+    | 'SvwValue'
+    | 'LvwValue'
+    | 'DvwValue'
     | 'VminValue'
+    | 'SvminValue'
+    | 'LvminValue'
+    | 'DvminValue'
     | 'VmaxValue'
+    | 'SvmaxValue'
+    | 'LvmaxValue'
+    | 'DvmaxValue'
+    | 'VbValue'
+    | 'SvbValue'
+    | 'LvbValue'
+    | 'DvbValue'
+    | 'ViValue'
+    | 'SviValue'
+    | 'LviValue'
+    | 'DviValue'
     | 'CqwValue'
     | 'CqhValue'
     | 'CqbValue'
     | 'CqiValue'
     | 'CqminValue'
-    | 'CqmaxValue';    
+    | 'CqmaxValue'
+    | 'LhValue'
+    | 'RlhValue';
   value: number;
   unit: string;
 }

package/src/parser.js

@@ -613,39 +613,61 @@ symbols_: {
   "ANGLE": 12,
   "CALC": 3,
   "CHS": 19,
-  "CQBS": 28,
-  "CQHS": 26,
-  "CQIS": 27,
-  "CQMAXS": 30,
-  "CQMINS": 29,
-  "CQWS": 25,
+  "CQBS": 48,
+  "CQHS": 46,
+  "CQIS": 47,
+  "CQMAXS": 50,
+  "CQMINS": 49,
+  "CQWS": 45,
   "DIV": 9,
+  "DVBS": 40,
+  "DVHS": 24,
+  "DVIS": 44,
+  "DVMAXS": 36,
+  "DVMINS": 32,
+  "DVWS": 28,
   "EMS": 17,
   "EOF": 1,
   "EXS": 18,
   "FREQ": 14,
   "FUNCTION": 10,
   "LENGTH": 11,
+  "LHS": 51,
   "LPAREN": 4,
+  "LVBS": 39,
+  "LVHS": 23,
+  "LVIS": 43,
+  "LVMAXS": 35,
+  "LVMINS": 31,
+  "LVWS": 27,
   "MUL": 8,
-  "NUMBER": 32,
-  "PERCENTAGE": 31,
+  "NUMBER": 54,
+  "PERCENTAGE": 53,
   "REMS": 20,
   "RES": 15,
+  "RLHS": 52,
   "RPAREN": 5,
   "SUB": 7,
+  "SVBS": 38,
+  "SVHS": 22,
+  "SVIS": 42,
+  "SVMAXS": 34,
+  "SVMINS": 30,
+  "SVWS": 26,
   "TIME": 13,
   "UNKNOWN_DIMENSION": 16,
+  "VBS": 37,
   "VHS": 21,
-  "VMAXS": 24,
-  "VMINS": 23,
-  "VWS": 22,
-  "dimension": 36,
+  "VIS": 41,
+  "VMAXS": 33,
+  "VMINS": 29,
+  "VWS": 25,
+  "dimension": 58,
   "error": 2,
-  "expression": 33,
-  "function": 35,
-  "math_expression": 34,
-  "number": 37
+  "expression": 55,
+  "function": 57,
+  "math_expression": 56,
+  "number": 59
 },
 terminals_: {
   1: "EOF",
@@ -669,17 +691,39 @@ terminals_: {
   19: "CHS",
   20: "REMS",
   21: "VHS",
-  22: "VWS",
-  23: "VMINS",
-  24: "VMAXS",
-  25: "CQWS",
-  26: "CQHS",
-  27: "CQIS",
-  28: "CQBS",
-  29: "CQMINS",
-  30: "CQMAXS",
-  31: "PERCENTAGE",
-  32: "NUMBER"
+  22: "SVHS",
+  23: "LVHS",
+  24: "DVHS",
+  25: "VWS",
+  26: "SVWS",
+  27: "LVWS",
+  28: "DVWS",
+  29: "VMINS",
+  30: "SVMINS",
+  31: "LVMINS",
+  32: "DVMINS",
+  33: "VMAXS",
+  34: "SVMAXS",
+  35: "LVMAXS",
+  36: "DVMAXS",
+  37: "VBS",
+  38: "SVBS",
+  39: "LVBS",
+  40: "DVBS",
+  41: "VIS",
+  42: "SVIS",
+  43: "LVIS",
+  44: "DVIS",
+  45: "CQWS",
+  46: "CQHS",
+  47: "CQIS",
+  48: "CQBS",
+  49: "CQMINS",
+  50: "CQMAXS",
+  51: "LHS",
+  52: "RLHS",
+  53: "PERCENTAGE",
+  54: "NUMBER"
 },
 TERROR: 2,
     EOF: 1,
@@ -785,14 +829,14 @@ TERROR: 2,
     },
 productions_: bp({
   pop: u([
-  33,
+  55,
   s,
-  [34, 9],
-  35,
+  [56, 9],
+  57,
   s,
-  [36, 23],
+  [58, 45],
   s,
-  [37, 3]
+  [59, 3]
 ]),
   rule: u([
   2,
@@ -800,7 +844,7 @@ productions_: bp({
   s,
   [3, 5],
   s,
-  [1, 25],
+  [1, 47],
   2,
   2,
   c,
@@ -945,86 +989,218 @@ case 22:
     break;
 
 case 23:
+    /*! Production::    dimension : SVHS */
+
+    this.$ = { type: 'SvhValue', value: parseFloat(yyvstack[yysp]), unit: 'svh' };
+    break;
+
+case 24:
+    /*! Production::    dimension : LVHS */
+
+    this.$ = { type: 'LvhValue', value: parseFloat(yyvstack[yysp]), unit: 'lvh' };
+    break;
+
+case 25:
+    /*! Production::    dimension : DVHS */
+
+    this.$ = { type: 'DvhValue', value: parseFloat(yyvstack[yysp]), unit: 'dvh' };
+    break;
+
+case 26:
     /*! Production::    dimension : VWS */
 
     this.$ = { type: 'VwValue', value: parseFloat(yyvstack[yysp]), unit: 'vw' };
     break;
 
-case 24:
+case 27:
+    /*! Production::    dimension : SVWS */
+
+    this.$ = { type: 'SvwValue', value: parseFloat(yyvstack[yysp]), unit: 'svw' };
+    break;
+
+case 28:
+    /*! Production::    dimension : LVWS */
+
+    this.$ = { type: 'LvwValue', value: parseFloat(yyvstack[yysp]), unit: 'lvw' };
+    break;
+
+case 29:
+    /*! Production::    dimension : DVWS */
+
+    this.$ = { type: 'DvwValue', value: parseFloat(yyvstack[yysp]), unit: 'dvw'  };
+    break;
+
+case 30:
     /*! Production::    dimension : VMINS */
 
     this.$ = { type: 'VminValue', value: parseFloat(yyvstack[yysp]), unit: 'vmin' };
     break;
 
-case 25:
+case 31:
+    /*! Production::    dimension : SVMINS */
+
+    this.$ = { type: 'SvminValue', value: parseFloat(yyvstack[yysp]), unit: 'svmin' };
+    break;
+
+case 32:
+    /*! Production::    dimension : LVMINS */
+
+    this.$ = { type: 'LvminValue', value: parseFloat(yyvstack[yysp]), unit: 'lvmin' };
+    break;
+
+case 33:
+    /*! Production::    dimension : DVMINS */
+
+    this.$ = { type: 'DvminValue', value: parseFloat(yyvstack[yysp]), unit: 'dvmin' };
+    break;
+
+case 34:
     /*! Production::    dimension : VMAXS */
 
     this.$ = { type: 'VmaxValue', value: parseFloat(yyvstack[yysp]), unit: 'vmax' };
     break;
 
-case 26:
+case 35:
+    /*! Production::    dimension : SVMAXS */
+
+    this.$ = { type: 'SvmaxValue', value: parseFloat(yyvstack[yysp]), unit: 'svmax' };
+    break;
+
+case 36:
+    /*! Production::    dimension : LVMAXS */
+
+    this.$ = { type: 'LvmaxValue', value: parseFloat(yyvstack[yysp]), unit: 'lvmax' };
+    break;
+
+case 37:
+    /*! Production::    dimension : DVMAXS */
+
+    this.$ = { type: 'DvmaxValue', value: parseFloat(yyvstack[yysp]), unit: 'dvmax' };
+    break;
+
+case 38:
+    /*! Production::    dimension : VBS */
+
+    this.$ = { type: 'VbValue', value: parseFloat(yyvstack[yysp]), unit: 'vb' };
+    break;
+
+case 39:
+    /*! Production::    dimension : SVBS */
+
+    this.$ = { type: 'SvbValue', value: parseFloat(yyvstack[yysp]), unit: 'svb' };
+    break;
+
+case 40:
+    /*! Production::    dimension : LVBS */
+
+    this.$ = { type: 'LvbValue', value: parseFloat(yyvstack[yysp]), unit: 'lvb' };
+    break;
+
+case 41:
+    /*! Production::    dimension : DVBS */
+
+    this.$ = { type: 'DvbValue', value: parseFloat(yyvstack[yysp]), unit: 'dvb' };
+    break;
+
+case 42:
+    /*! Production::    dimension : VIS */
+
+    this.$ = { type: 'VhValue', value: parseFloat(yyvstack[yysp]), unit: 'vi' };
+    break;
+
+case 43:
+    /*! Production::    dimension : SVIS */
+
+    this.$ = { type: 'SvhValue', value: parseFloat(yyvstack[yysp]), unit: 'svi' };
+    break;
+
+case 44:
+    /*! Production::    dimension : LVIS */
+
+    this.$ = { type: 'LvhValue', value: parseFloat(yyvstack[yysp]), unit: 'lvi' };
+    break;
+
+case 45:
+    /*! Production::    dimension : DVIS */
+
+    this.$ = { type: 'DvhValue', value: parseFloat(yyvstack[yysp]), unit: 'dvi' };
+    break;
+
+case 46:
     /*! Production::    dimension : CQWS */
 
     this.$ = { type: 'CqwValue', value: parseFloat(yyvstack[yysp]), unit: 'cqw' };
     break;
 
-case 27:
+case 47:
     /*! Production::    dimension : CQHS */
 
     this.$ = { type: 'CqhValue', value: parseFloat(yyvstack[yysp]), unit: 'cqh' };
     break;
 
-case 28:
+case 48:
     /*! Production::    dimension : CQIS */
 
     this.$ = { type: 'CqiValue', value: parseFloat(yyvstack[yysp]), unit: 'cqi' };
     break;
 
-case 29:
+case 49:
     /*! Production::    dimension : CQBS */
 
     this.$ = { type: 'CqbValue', value: parseFloat(yyvstack[yysp]), unit: 'cqb' };
     break;
 
-case 30:
+case 50:
     /*! Production::    dimension : CQMINS */
 
     this.$ = { type: 'CqminValue', value: parseFloat(yyvstack[yysp]), unit: 'cqmin' };
     break;
 
-case 31:
+case 51:
     /*! Production::    dimension : CQMAXS */
 
     this.$ = { type: 'CqmaxValue', value: parseFloat(yyvstack[yysp]), unit: 'cqmax' };
     break;
 
-case 32:
+case 52:
+    /*! Production::    dimension : LHS */
+
+    this.$ = { type: 'LhValue', value: parseFloat(yyvstack[yysp]), unit: 'lh' };
+    break;
+
+case 53:
+    /*! Production::    dimension : RLHS */
+
+    this.$ = { type: 'RlhValue', value: parseFloat(yyvstack[yysp]), unit: 'rlh' };
+    break;
+
+case 54:
     /*! Production::    dimension : PERCENTAGE */
 
     this.$ = { type: 'PercentageValue', value: parseFloat(yyvstack[yysp]), unit: '%' };
     break;
 
-case 33:
+case 55:
     /*! Production::    dimension : ADD dimension */
 
     var prev = yyvstack[yysp]; this.$ = prev;
     break;
 
-case 34:
+case 56:
     /*! Production::    dimension : SUB dimension */
 
     var prev = yyvstack[yysp]; prev.value *= -1; this.$ = prev;
     break;
 
-case 35:
+case 57:
     /*! Production::    number : NUMBER */
-case 36:
+case 58:
     /*! Production::    number : ADD NUMBER */
 
     this.$ = { type: 'Number', value: parseFloat(yyvstack[yysp]) };
     break;
 
-case 37:
+case 59:
     /*! Production::    number : SUB NUMBER */
 
     this.$ = { type: 'Number', value: parseFloat(yyvstack[yysp]) * -1 };
@@ -1034,24 +1210,24 @@ case 37:
 },
 table: bt({
   len: u([
-  32,
+  54,
   1,
   5,
   1,
-  31,
+  53,
   s,
-  [0, 25],
-  25,
-  25,
+  [0, 47],
+  47,
+  47,
   0,
   0,
   s,
-  [31, 5],
+  [53, 5],
   5,
   0,
   0,
-  24,
-  24,
+  46,
+  46,
   0,
   0,
   6,
@@ -1067,37 +1243,37 @@ table: bt({
   6,
   7,
   s,
-  [10, 28, 1],
+  [10, 50, 1],
   1,
   1,
   s,
   [6, 4, 1],
   4,
   c,
-  [39, 27],
+  [61, 49],
   c,
-  [38, 4],
+  [60, 4],
   6,
   7,
   c,
-  [28, 22],
-  36,
+  [50, 44],
+  58,
   c,
-  [25, 25],
+  [47, 47],
   c,
-  [81, 31],
+  [147, 53],
   c,
-  [31, 124],
+  [53, 212],
   s,
   [5, 5, 1],
   c,
-  [185, 23],
+  [317, 45],
   c,
-  [209, 24],
-  36,
+  [363, 46],
+  58,
   1,
   c,
-  [54, 5],
+  [98, 5],
   c,
   [6, 6],
   c,
@@ -1105,26 +1281,26 @@ table: bt({
 ]),
   type: u([
   s,
-  [2, 27],
+  [2, 49],
   s,
   [0, 5],
   1,
   s,
-  [2, 33],
+  [2, 55],
   s,
   [0, 4],
   c,
-  [28, 25],
+  [50, 47],
   c,
-  [25, 49],
+  [47, 93],
   c,
-  [81, 31],
+  [147, 53],
   c,
-  [31, 127],
+  [53, 215],
   c,
-  [184, 25],
+  [316, 47],
   c,
-  [24, 18]
+  [46, 18]
 ]),
   state: u([
   1,
@@ -1132,30 +1308,30 @@ table: bt({
   5,
   6,
   7,
-  39,
+  61,
   c,
   [4, 3],
-  40,
-  44,
-  46,
+  62,
+  66,
+  68,
   c,
   [6, 3],
-  47,
+  69,
   c,
   [4, 3],
-  48,
+  70,
   c,
   [4, 3],
-  49,
+  71,
   c,
   [4, 3],
-  50,
+  72,
   c,
   [22, 5]
 ]),
   mode: u([
   s,
-  [1, 294],
+  [1, 536],
   s,
   [2, 4],
   c,
@@ -1166,70 +1342,70 @@ table: bt({
   goto: u([
   3,
   4,
-  30,
-  31,
+  52,
+  53,
   s,
-  [8, 22, 1],
+  [8, 44, 1],
   s,
-  [32, 7, 1],
+  [54, 7, 1],
   c,
-  [33, 27],
-  42,
-  43,
+  [55, 49],
+  64,
+  65,
   c,
-  [24, 21],
-  41,
+  [46, 43],
+  63,
   c,
-  [24, 23],
-  45,
+  [46, 45],
+  67,
   c,
-  [75, 27],
+  [141, 49],
   c,
-  [27, 108],
-  51,
+  [49, 196],
+  73,
   c,
-  [216, 4],
+  [392, 4],
   c,
-  [164, 23],
+  [296, 45],
   c,
-  [23, 23],
+  [45, 45],
   s,
   [3, 4],
-  36,
-  37,
+  58,
+  59,
   s,
   [4, 4],
-  36,
-  37,
-  52,
+  58,
+  59,
+  74,
   c,
-  [63, 4]
+  [107, 4]
 ])
 }),
 defaultActions: bda({
   idx: u([
   s,
-  [5, 25, 1],
-  32,
-  33,
-  40,
-  41,
-  44,
-  45,
-  48,
-  49,
-  51,
-  52
+  [5, 47, 1],
+  54,
+  55,
+  62,
+  63,
+  66,
+  67,
+  70,
+  71,
+  73,
+  74
 ]),
   goto: u([
   s,
-  [8, 25, 1],
-  35,
+  [8, 47, 1],
+  57,
   1,
-  33,
-  36,
-  34,
-  37,
+  55,
+  58,
+  56,
+  59,
   5,
   6,
   7,
@@ -1273,7 +1449,7 @@ parse: function parse(input) {
     var TERROR = this.TERROR;
     var EOF = this.EOF;
     var ERROR_RECOVERY_TOKEN_DISCARD_COUNT = (this.options.errorRecoveryTokenDiscardCount | 0) || 3;
-    var NO_ACTION = [0, 53 /* === table.length :: ensures that anyone using this new state will fail dramatically! */];
+    var NO_ACTION = [0, 75 /* === table.length :: ensures that anyone using this new state will fail dramatically! */];
 
     var lexer;
     if (this.__lexer__) {
@@ -3626,139 +3802,227 @@ EOF: 1,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)vw\b */
-      11: 22,
+      11: 25,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)svw\b */
+      12: 26,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)lvw\b */
+      13: 27,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)dvw\b */
+      14: 28,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)vh\b */
-      12: 21,
+      15: 21,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)svh\b */
+      16: 22,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)lvh\b */
+      17: 23,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)dvh\b */
+      18: 24,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)vmin\b */
-      13: 23,
+      19: 29,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)svmin\b */
+      20: 30,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)lvmin\b */
+      21: 31,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)dvmin\b */
+      22: 32,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)vmax\b */
-      14: 24,
+      23: 33,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)svmax\b */
+      24: 34,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)lvmax\b */
+      25: 35,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)dvmax\b */
+      26: 36,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)vb\b */
+      27: 37,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)svb\b */
+      28: 38,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)lvb\b */
+      29: 39,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)dvb\b */
+      30: 40,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)vi\b */
+      31: 41,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)svi\b */
+      32: 42,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)lvi\b */
+      33: 43,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)dvi\b */
+      34: 44,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)cqw\b */
-      15: 25,
+      35: 45,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)cqh\b */
-      16: 26,
+      36: 46,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)cqi\b */
-      17: 27,
+      37: 47,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)cqb\b */
-      18: 28,
+      38: 48,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)cqmin\b */
-      19: 29,
+      39: 49,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)cqmax\b */
-      20: 30,
+      40: 50,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)lh\b */
+      41: 51,
+
+      /*! Conditions:: INITIAL */
+      /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)rlh\b */
+      42: 52,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)cm\b */
-      21: 11,
+      43: 11,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)mm\b */
-      22: 11,
+      44: 11,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)Q\b */
-      23: 11,
+      45: 11,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)in\b */
-      24: 11,
+      46: 11,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)pt\b */
-      25: 11,
+      47: 11,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)pc\b */
-      26: 11,
+      48: 11,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)px\b */
-      27: 11,
+      49: 11,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)deg\b */
-      28: 12,
+      50: 12,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)grad\b */
-      29: 12,
+      51: 12,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)rad\b */
-      30: 12,
+      52: 12,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)turn\b */
-      31: 12,
+      53: 12,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)s\b */
-      32: 13,
+      54: 13,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)ms\b */
-      33: 13,
+      55: 13,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)Hz\b */
-      34: 14,
+      56: 14,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)kHz\b */
-      35: 14,
+      57: 14,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)dpi\b */
-      36: 15,
+      58: 15,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)dpcm\b */
-      37: 15,
+      59: 15,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)dppx\b */
-      38: 15,
+      60: 15,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)% */
-      39: 31,
+      61: 53,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)\b */
-      40: 32,
+      62: 54,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       (([0-9]+(\.[0-9]+)?|\.[0-9]+)(e(\+|-)[0-9]+)?)-?([a-zA-Z_]|[\240-\377]|(\\[0-9a-fA-F]{1,6}(\r\n|[ \t\r\n\f])?|\\[^\r\n\f0-9a-fA-F]))([a-zA-Z0-9_-]|[\240-\377]|(\\[0-9a-fA-F]{1,6}(\r\n|[ \t\r\n\f])?|\\[^\r\n\f0-9a-fA-F]))*\b */
-      41: 16,
+      63: 16,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       \( */
-      42: 4,
+      64: 4,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       \) */
-      43: 5,
+      65: 5,
 
       /*! Conditions:: INITIAL */
       /*! Rule::       $ */
-      44: 1
+      66: 1
     },
 
     rules: [
@@ -3774,39 +4038,61 @@ EOF: 1,
       /*  9: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)ch\b)/i,
       /* 10: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)rem\b)/i,
       /* 11: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)vw\b)/i,
-      /* 12: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)vh\b)/i,
-      /* 13: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)vmin\b)/i,
-      /* 14: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)vmax\b)/i,
-      /* 15: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)cqw\b)/i,
-      /* 16: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)cqh\b)/i,
-      /* 17: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)cqi\b)/i,
-      /* 18: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)cqb\b)/i,
-      /* 19: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)cqmin\b)/i,
-      /* 20: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)cqmax\b)/i,
-      /* 21: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)cm\b)/i,
-      /* 22: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)mm\b)/i,
-      /* 23: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)Q\b)/i,
-      /* 24: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)in\b)/i,
-      /* 25: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)pt\b)/i,
-      /* 26: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)pc\b)/i,
-      /* 27: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)px\b)/i,
-      /* 28: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)deg\b)/i,
-      /* 29: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)grad\b)/i,
-      /* 30: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)rad\b)/i,
-      /* 31: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)turn\b)/i,
-      /* 32: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)s\b)/i,
-      /* 33: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)ms\b)/i,
-      /* 34: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)Hz\b)/i,
-      /* 35: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)kHz\b)/i,
-      /* 36: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)dpi\b)/i,
-      /* 37: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)dpcm\b)/i,
-      /* 38: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)dppx\b)/i,
-      /* 39: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)%)/i,
-      /* 40: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)\b)/i,
-      /* 41: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)-?([^\W\d]|[ -ÿ]|(\\[\dA-Fa-f]{1,6}(\r\n|[\t\n\f\r ])?|\\[^\d\n\f\rA-Fa-f]))([\w\-]|[ -ÿ]|(\\[\dA-Fa-f]{1,6}(\r\n|[\t\n\f\r ])?|\\[^\d\n\f\rA-Fa-f]))*\b)/i,
-      /* 42: */  /^(?:\()/i,
-      /* 43: */  /^(?:\))/i,
-      /* 44: */  /^(?:$)/i
+      /* 12: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)svw\b)/i,
+      /* 13: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)lvw\b)/i,
+      /* 14: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)dvw\b)/i,
+      /* 15: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)vh\b)/i,
+      /* 16: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)svh\b)/i,
+      /* 17: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)lvh\b)/i,
+      /* 18: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)dvh\b)/i,
+      /* 19: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)vmin\b)/i,
+      /* 20: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)svmin\b)/i,
+      /* 21: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)lvmin\b)/i,
+      /* 22: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)dvmin\b)/i,
+      /* 23: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)vmax\b)/i,
+      /* 24: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)svmax\b)/i,
+      /* 25: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)lvmax\b)/i,
+      /* 26: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)dvmax\b)/i,
+      /* 27: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)vb\b)/i,
+      /* 28: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)svb\b)/i,
+      /* 29: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)lvb\b)/i,
+      /* 30: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)dvb\b)/i,
+      /* 31: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)vi\b)/i,
+      /* 32: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)svi\b)/i,
+      /* 33: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)lvi\b)/i,
+      /* 34: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)dvi\b)/i,
+      /* 35: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)cqw\b)/i,
+      /* 36: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)cqh\b)/i,
+      /* 37: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)cqi\b)/i,
+      /* 38: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)cqb\b)/i,
+      /* 39: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)cqmin\b)/i,
+      /* 40: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)cqmax\b)/i,
+      /* 41: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)lh\b)/i,
+      /* 42: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)rlh\b)/i,
+      /* 43: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)cm\b)/i,
+      /* 44: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)mm\b)/i,
+      /* 45: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)Q\b)/i,
+      /* 46: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)in\b)/i,
+      /* 47: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)pt\b)/i,
+      /* 48: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)pc\b)/i,
+      /* 49: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)px\b)/i,
+      /* 50: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)deg\b)/i,
+      /* 51: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)grad\b)/i,
+      /* 52: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)rad\b)/i,
+      /* 53: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)turn\b)/i,
+      /* 54: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)s\b)/i,
+      /* 55: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)ms\b)/i,
+      /* 56: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)Hz\b)/i,
+      /* 57: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)kHz\b)/i,
+      /* 58: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)dpi\b)/i,
+      /* 59: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)dpcm\b)/i,
+      /* 60: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)dppx\b)/i,
+      /* 61: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)%)/i,
+      /* 62: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)\b)/i,
+      /* 63: */  /^(?:((\d+(\.\d+)?|\.\d+)(e(\+|-)\d+)?)-?([^\W\d]|[ -ÿ]|(\\[\dA-Fa-f]{1,6}(\r\n|[\t\n\f\r ])?|\\[^\d\n\f\rA-Fa-f]))([\w\-]|[ -ÿ]|(\\[\dA-Fa-f]{1,6}(\r\n|[\t\n\f\r ])?|\\[^\d\n\f\rA-Fa-f]))*\b)/i,
+      /* 64: */  /^(?:\()/i,
+      /* 65: */  /^(?:\))/i,
+      /* 66: */  /^(?:$)/i
     ],
 
     conditions: {
@@ -3856,7 +4142,29 @@ EOF: 1,
           41,
           42,
           43,
-          44
+          44,
+          45,
+          46,
+          47,
+          48,
+          49,
+          50,
+          51,
+          52,
+          53,
+          54,
+          55,
+          56,
+          57,
+          58,
+          59,
+          60,
+          61,
+          62,
+          63,
+          64,
+          65,
+          66
         ],
 
         inclusive: true