0.21.1

Author: yuanchuan

CHANGELOG.md

@@ -1,3 +1,18 @@
+## 0.21.1
+
+### Enhancement
+
+  * Add support for more Math notations:
+    `&&`, `||`, `|`, `&`, `∧`, `∨`
+
+### Fixes
+
+  * Fix default context value.
+
+<br /> <br />
+
+
+
 ## 0.21.0
 
 ### Features
@@ -16,7 +31,7 @@
     }
     ```
 
-### changes
+### Changes
 
   *  Use a shorter name `fill` for `fill-rule`.
 

css-doodle.js

@@ -1,4 +1,4 @@
-/*! css-doodle@0.21.0 */
+/*! css-doodle@0.21.1 */
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define(factory) :
@@ -1489,15 +1489,18 @@
   }
 
   const operator = {
-    '^': 5,
-    '*': 4, '/': 4, '%': 4,
-    '+': 3, '-': 3,
-    '(': 2, ')': 2,
-    '<': 1, '>': 1,
-    '=': 1, '==': 1,
-    '≤': 1, '<=': 1,
-    '≥': 1, '>=': 1,
-    '≠': 1, '!=': 1,
+    '^': 7,
+    '*': 6, '/': 6, '÷': 6, '%': 6,
+    '&': 5, '|': 5,
+    '+': 4, '-': 4,
+    '<': 3, '>': 3,
+    '=': 3, '==': 3,
+    '≤': 3, '<=': 3,
+    '≥': 3, '>=': 3,
+    '≠': 3, '!=': 3,
+    '∧': 2, '&&': 2,
+    '∨': 2, '||': 2,
+    '(': 1 , ')': 1,
   };
 
   function calc$1(expr, context, repeat = []) {
@@ -1576,6 +1579,9 @@
         if (c == '=' && last_token && /^[!<>=]$/.test(last_token.value)) {
           last_token.value += c;
         }
+        else if (/^[|&]$/.test(c) && last_token && last_token.value == c) {
+          last_token.value += c;
+        }
         else if (c == '-' && expr[i - 1] == 'e') {
           num += c;
         }
@@ -1705,15 +1711,18 @@
       case '+': return a + b;
       case '-': return a - b;
       case '*': return a * b;
-      case '/': return a / b;
       case '%': return a % b;
-      case '^': return Math.pow(a, b);
+      case '|': return a | b;
       case '<': return a < b;
       case '>': return a > b;
+      case '^': return Math.pow(a, b);
+      case '÷': case '/': return a / b;
       case '=': case '==': return a == b;
       case '≤': case '<=': return a <= b;
       case '≥': case '>=': return a >= b;
       case '≠': case '!=': return a != b;
+      case '∧': case '&&': return a && b;
+      case '∨': case '||': return a || b;
     }
   }
 
@@ -3191,9 +3200,9 @@
 
       match({ count, grid, x, y }) {
         return expr => {
-          return !!calc(expr, {
+          return !!calc('(' + expr + ')', {
             x, y,
-            X: grid.x, Y: grid.Y,
+            X: grid.x, Y: grid.y,
             i: count,
           });
         }

css-doodle.min.js

@@ -1,6 +1,6 @@
 {
   "name": "css-doodle",
-  "version": "0.21.0",
+  "version": "0.21.1",
   "description": "A web component for drawing patterns with CSS",
   "main": "css-doodle.js",
   "scripts": {