Merge branch 'main' into cloudflare

transcriptaze · Oct 15, 2024 · 70eccee · 70eccee
2 parents a2b0090 + 204fb07
commit 70eccee
Show file tree

Hide file tree

Showing 33 changed files with 4,958 additions and 4,472 deletions.
diff --git a/TODO.md b/TODO.md
@@ -1,10 +1,11 @@
 # TODO
 
-- [ ] Drop shadows
+- [x] Drop shadows
+      - https://css-tricks.com/adding-shadows-to-svg-icons-with-css-and-svg-filters/
+      - https://stackoverflow.com/questions/17883655/svg-shadow-cut-off
+
 - [ ] [Add supported component and position items in polar coordinates](cf. https://github.com/transcriptaze/vpd/issues/4)
-      - [ ] Polar coordinates/offsets
-            - [x] demo project
-            - (?) origin
+      - [x] Polar coordinates/offsets
       - [x] CHANGELOG
       - [ ] README
       - [ ] User manual

diff --git a/doc/extras/demo/res/demo-dark.svg b/doc/extras/demo/res/demo-dark.svg
diff --git a/doc/extras/demo/res/demo.svg b/doc/extras/demo/res/demo.svg
diff --git a/doc/extras/demo/src/demo_widget.h b/doc/extras/demo/src/demo_widget.h
@@ -5,7 +5,7 @@ const auto DEMO_INPUT_PJ301M = mm2px(Vec(35.56, 25.4));
 const auto DEMO_PARAM_TRIMPOT = mm2px(Vec(15.24, 25.4));
 const auto DEMO_PARAM_PUSHBUTTON = mm2px(Vec(15.24, 45.72));
 const auto DEMO_PARAM_BUTTON = mm2px(Vec(15.24, 66.04));
-const auto DEMO_PARAM_SLIDER = mm2px(Vec(35.56, 45.72));
+const auto DEMO_PARAM_SLIDER = mm2px(Vec(35.56, 55.88));
 const auto DEMO_PARAM_ROUNDBLACKKNOB = mm2px(Vec(25.4, 106.68));
 const auto DEMO_LIGHT_RED = mm2px(Vec(40.64, 106.68));
 const auto DEMO_LIGHT_ORANGE = mm2px(Vec(38.6, 99.06));

diff --git a/grammars/command/grammar.js b/grammars/command/grammar.js
@@ -670,19 +670,25 @@ module.exports = grammar({
         seq( 
           alias($._originy, $.y), 
           ',', 
-          alias($._originx, $.x)
+          alias($._originx, $.x),
+          optional($.polar),
         ),
         seq( 
           alias($._originx,$.x),
           ',',
           alias($._originy,$.y),
+          optional($.polar),
         ),
         seq(
           alias('@',$.absolute),
           alias(/([0-9]+)(\.[0-9]*)?(mm|h|H)/,$.x),
           ',',
           alias(/([0-9]+)(\.[0-9]*)?(mm|h|H)/,$.y),
-         )
+        ),
+        seq(
+          alias('@',$.absolute),
+          $.polar,
+        ),
       ),
     ),
 

diff --git a/grammars/command/src/grammar.json b/grammars/command/src/grammar.json
@@ -3340,6 +3340,18 @@
                   },
                   "named": true,
                   "value": "x"
+                },
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "SYMBOL",
+                      "name": "polar"
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
                 }
               ]
             },
@@ -3367,6 +3379,18 @@
                   },
                   "named": true,
                   "value": "y"
+                },
+                {
+                  "type": "CHOICE",
+                  "members": [
+                    {
+                      "type": "SYMBOL",
+                      "name": "polar"
+                    },
+                    {
+                      "type": "BLANK"
+                    }
+                  ]
                 }
               ]
             },
@@ -3405,6 +3429,24 @@
                   "value": "y"
                 }
               ]
+            },
+            {
+              "type": "SEQ",
+              "members": [
+                {
+                  "type": "ALIAS",
+                  "content": {
+                    "type": "STRING",
+                    "value": "@"
+                  },
+                  "named": true,
+                  "value": "absolute"
+                },
+                {
+                  "type": "SYMBOL",
+                  "name": "polar"
+                }
+              ]
             }
           ]
         }

diff --git a/grammars/command/src/node-types.json b/grammars/command/src/node-types.json
@@ -829,6 +829,10 @@
           "type": "absolute",
           "named": true
         },
+        {
+          "type": "polar",
+          "named": true
+        },
         {
           "type": "x",
           "named": true