It's working!

designs/plugintest/src/plugin-bartack.mjs

@@ -1,4 +1,4 @@
-import { bartackPlugin } from '@freesewing/plugin-bartack'
+import { bartackPlugin } from '@freesewing/plugin-annotations'
 import { base } from './base.mjs'
 
 const bartackOptions = (options) => ({

designs/plugintest/src/plugin-buttons.mjs

@@ -1,4 +1,4 @@
-import { buttonsPlugin } from '@freesewing/plugin-buttons'
+import { buttonsPlugin } from '@freesewing/plugin-annotations'
 import { base } from './base.mjs'
 
 const addThese = [

designs/plugintest/src/plugin-cutonfold.mjs

@@ -1,4 +1,4 @@
-import { cutonfoldPlugin } from '@freesewing/plugin-cutonfold'
+import { cutonfoldPlugin } from '@freesewing/plugin-annotations'
 import { base } from './base.mjs'
 
 const pluginCutonfold = ({ points, Point, paths, Path, options, macro, part }) => {

designs/plugintest/src/plugin-notches.mjs

@@ -1,4 +1,4 @@
-import { notchesPlugin } from '@freesewing/plugin-notches'
+import { notchesPlugin } from '@freesewing/plugin-annotations'
 
 const addThese = ['notch', 'bnotch']
 

plugins/plugin-annotations/README.md

@@ -22,7 +22,7 @@
   </a><a
   href="#contributors-"
   title="All Contributors"
-  ><img src="https://img.shields.io/badge/all_contributors-102-pink.svg"
+  ><img src="https://img.shields.io/badge/all_contributors-103-pink.svg"
   alt="All Contributors"/>
   </a></p><p align='center'><a
   href="https://twitter.com/freesewing_org"
@@ -210,73 +210,74 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/kristinruben"><img src="https://avatars.githubusercontent.com/u/17237479?v=4?s=100" width="100px;" alt="Kristin Ruben"/><br /><sub><b>Kristin Ruben</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=kristinruben" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Loudepeuter"><img src="https://avatars.githubusercontent.com/u/38081954?v=4?s=100" width="100px;" alt="Loudepeuter"/><br /><sub><b>Loudepeuter</b></sub></a><br /><a href="#translation-Loudepeuter" title="Translation">🌍</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/lucibytes"><img src="https://avatars.githubusercontent.com/u/77203781?v=4?s=100" width="100px;" alt="Lucian"/><br /><sub><b>Lucian</b></sub></a><br /><a href="#eventOrganizing-lucibytes" title="Event Organizing">📋</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/MA-TATAS"><img src="https://avatars.githubusercontent.com/u/125549564?v=4?s=100" width="100px;" alt="MA-TATAS"/><br /><sub><b>MA-TATAS</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=MA-TATAS" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/manufakturedelweiss"><img src="https://avatars.githubusercontent.com/u/38063391?v=4?s=100" width="100px;" alt="Marcus"/><br /><sub><b>Marcus</b></sub></a><br /><a href="#translation-manufakturedelweiss" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/martintribo"><img src="https://avatars.githubusercontent.com/u/1613442?v=4?s=100" width="100px;" alt="Martin Tribo"/><br /><sub><b>Martin Tribo</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=martintribo" title="Documentation">📖</a></td>
     </tr>
     <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/martintribo"><img src="https://avatars.githubusercontent.com/u/1613442?v=4?s=100" width="100px;" alt="Martin Tribo"/><br /><sub><b>Martin Tribo</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=martintribo" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/nadege"><img src="https://avatars.githubusercontent.com/u/3792171?v=4?s=100" width="100px;" alt="Nadege Michel"/><br /><sub><b>Nadege Michel</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=nadege" title="Tests">⚠️</a> <a href="https://github.com/freesewing/freesewing/commits?author=nadege" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/nataliasayang"><img src="https://avatars.githubusercontent.com/u/48160791?v=4?s=100" width="100px;" alt="Natalia"/><br /><sub><b>Natalia</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=nataliasayang" title="Code">💻</a> <a href="#design-nataliasayang" title="Design">🎨</a> <a href="#blog-nataliasayang" title="Blogposts">📝</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://yergler.net/"><img src="https://avatars.githubusercontent.com/u/510875?v=4?s=100" width="100px;" alt="Nathan Yergler"/><br /><sub><b>Nathan Yergler</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=nyergler" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/nicholasdower"><img src="https://avatars.githubusercontent.com/u/9117775?v=4?s=100" width="100px;" alt="Nick Dower"/><br /><sub><b>Nick Dower</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=nicholasdower" title="Documentation">📖</a> <a href="https://github.com/freesewing/freesewing/commits?author=nicholasdower" title="Code">💻</a> <a href="https://github.com/freesewing/freesewing/issues?q=author%3Anicholasdower" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/nchilada"><img src="https://avatars.githubusercontent.com/u/692925?v=4?s=100" width="100px;" alt="Nikhil Chelliah"/><br /><sub><b>Nikhil Chelliah</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=nchilada" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/OysteinHoiby"><img src="https://avatars.githubusercontent.com/u/49735055?v=4?s=100" width="100px;" alt="OysteinHoiby"/><br /><sub><b>OysteinHoiby</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=OysteinHoiby" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://pat.forringer.com/"><img src="https://avatars.githubusercontent.com/u/136456?v=4?s=100" width="100px;" alt="Patrick Forringer"/><br /><sub><b>Patrick Forringer</b></sub></a><br /><a href="#plugin-destos" title="Plugin/utility libraries">🔌</a></td>
     </tr>
     <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://pat.forringer.com/"><img src="https://avatars.githubusercontent.com/u/136456?v=4?s=100" width="100px;" alt="Patrick Forringer"/><br /><sub><b>Patrick Forringer</b></sub></a><br /><a href="#plugin-destos" title="Plugin/utility libraries">🔌</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://pd75.github.io/"><img src="https://avatars.githubusercontent.com/u/10294795?v=4?s=100" width="100px;" alt="Paul"/><br /><sub><b>Paul</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=PD75" title="Documentation">📖</a> <a href="#blog-PD75" title="Blogposts">📝</a> <a href="#translation-PD75" title="Translation">🌍</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/phillipthelen"><img src="https://avatars.githubusercontent.com/u/298062?v=4?s=100" width="100px;" alt="Phillip Thelen"/><br /><sub><b>Phillip Thelen</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=phillipthelen" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Pixieish"><img src="https://avatars.githubusercontent.com/u/32991415?v=4?s=100" width="100px;" alt="Pixieish"/><br /><sub><b>Pixieish</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=Pixieish" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://www.uza.be/persoon/prof-dr-sorcha-ni-dhubhghaill"><img src="https://avatars.githubusercontent.com/u/30624634?v=4?s=100" width="100px;" alt="Prof. dr. Sorcha Ní Dhubhghaill"/><br /><sub><b>Prof. dr. Sorcha Ní Dhubhghaill</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=sorchanidhubhghaill" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/QuentinFelix"><img src="https://avatars.githubusercontent.com/u/5288091?v=4?s=100" width="100px;" alt="Quentin FELIX"/><br /><sub><b>Quentin FELIX</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=QuentinFelix" title="Code">💻</a> <a href="#design-QuentinFelix" title="Design">🎨</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/RikHekker"><img src="https://avatars.githubusercontent.com/u/31843274?v=4?s=100" width="100px;" alt="Rik Hekker"/><br /><sub><b>Rik Hekker</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/issues?q=author%3ARikHekker" title="Bug reports">🐛</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="http://resume.livingston-gray.com/faq.html"><img src="https://avatars.githubusercontent.com/u/6462?v=4?s=100" width="100px;" alt="Sam Livingston-Gray"/><br /><sub><b>Sam Livingston-Gray</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=geeksam" title="Documentation">📖</a></td>
     </tr>
     <tr>
+      <td align="center" valign="top" width="14.28%"><a href="http://resume.livingston-gray.com/faq.html"><img src="https://avatars.githubusercontent.com/u/6462?v=4?s=100" width="100px;" alt="Sam Livingston-Gray"/><br /><sub><b>Sam Livingston-Gray</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=geeksam" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/sannek"><img src="https://avatars.githubusercontent.com/u/17491062?v=4?s=100" width="100px;" alt="Sanne"/><br /><sub><b>Sanne</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=sannek" title="Code">💻</a> <a href="https://github.com/freesewing/freesewing/commits?author=sannek" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Tyrannogina"><img src="https://avatars.githubusercontent.com/u/19556565?v=4?s=100" width="100px;" alt="Sara Latorre"/><br /><sub><b>Sara Latorre</b></sub></a><br /><a href="#translation-Tyrannogina" title="Translation">🌍</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/SeaZeeZee"><img src="https://avatars.githubusercontent.com/u/86711383?v=4?s=100" width="100px;" alt="SeaZeeZee"/><br /><sub><b>SeaZeeZee</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=SeaZeeZee" title="Documentation">📖</a> <a href="https://github.com/freesewing/freesewing/commits?author=SeaZeeZee" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/SimonbJohnson"><img src="https://avatars.githubusercontent.com/u/2110742?v=4?s=100" width="100px;" alt="SimonbJohnson"/><br /><sub><b>SimonbJohnson</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/issues?q=author%3ASimonbJohnson" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/SirCharlotte"><img src="https://avatars.githubusercontent.com/u/63847870?v=4?s=100" width="100px;" alt="SirCharlotte"/><br /><sub><b>SirCharlotte</b></sub></a><br /><a href="#translation-SirCharlotte" title="Translation">🌍</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://www.instagram.com/celine_mge/"><img src="https://avatars.githubusercontent.com/u/57619777?v=4?s=100" width="100px;" alt="Slylele"/><br /><sub><b>Slylele</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=Slylele" title="Documentation">📖</a> <a href="#translation-Slylele" title="Translation">🌍</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Soazillon"><img src="https://avatars.githubusercontent.com/u/40845940?v=4?s=100" width="100px;" alt="Soazillon"/><br /><sub><b>Soazillon</b></sub></a><br /><a href="#translation-Soazillon" title="Translation">🌍</a></td>
     </tr>
     <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/Soazillon"><img src="https://avatars.githubusercontent.com/u/40845940?v=4?s=100" width="100px;" alt="Soazillon"/><br /><sub><b>Soazillon</b></sub></a><br /><a href="#translation-Soazillon" title="Translation">🌍</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/SoneaTheBest"><img src="https://avatars.githubusercontent.com/u/64635425?v=4?s=100" width="100px;" alt="SoneaTheBest"/><br /><sub><b>SoneaTheBest</b></sub></a><br /><a href="#translation-SoneaTheBest" title="Translation">🌍</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://metafly.info/"><img src="https://avatars.githubusercontent.com/u/961256?v=4?s=100" width="100px;" alt="Stefan Sydow"/><br /><sub><b>Stefan Sydow</b></sub></a><br /><a href="#translation-stsydow" title="Translation">🌍</a> <a href="https://github.com/freesewing/freesewing/commits?author=stsydow" title="Documentation">📖</a> <a href="https://github.com/freesewing/freesewing/commits?author=stsydow" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/TriploidTree"><img src="https://avatars.githubusercontent.com/u/4170521?v=4?s=100" width="100px;" alt="Tríona"/><br /><sub><b>Tríona</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=TriploidTree" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/theUnmutual"><img src="https://avatars.githubusercontent.com/u/22374635?v=4?s=100" width="100px;" alt="Unmutual"/><br /><sub><b>Unmutual</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=theUnmutual" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/woutervdub"><img src="https://avatars.githubusercontent.com/u/24414629?v=4?s=100" width="100px;" alt="Wouter van Wageningen"/><br /><sub><b>Wouter van Wageningen</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=woutervdub" title="Code">💻</a> <a href="#design-woutervdub" title="Design">🎨</a> <a href="#tool-woutervdub" title="Tools">🔧</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/amysews"><img src="https://avatars.githubusercontent.com/u/25280778?v=4?s=100" width="100px;" alt="amysews"/><br /><sub><b>amysews</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=amysews" title="Documentation">📖</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/anna-puk"><img src="https://avatars.githubusercontent.com/u/100537439?v=4?s=100" width="100px;" alt="anna-puk"/><br /><sub><b>anna-puk</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=anna-puk" title="Code">💻</a></td>
     </tr>
     <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/anna-puk"><img src="https://avatars.githubusercontent.com/u/100537439?v=4?s=100" width="100px;" alt="anna-puk"/><br /><sub><b>anna-puk</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=anna-puk" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/beautifulsummermoon"><img src="https://avatars.githubusercontent.com/u/40396388?v=4?s=100" width="100px;" alt="beautifulsummermoon"/><br /><sub><b>beautifulsummermoon</b></sub></a><br /><a href="#translation-beautifulsummermoon" title="Translation">🌍</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/berce"><img src="https://avatars.githubusercontent.com/u/10439709?v=4?s=100" width="100px;" alt="berce"/><br /><sub><b>berce</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=berce" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/biou"><img src="https://avatars.githubusercontent.com/u/1340376?v=4?s=100" width="100px;" alt="biou"/><br /><sub><b>biou</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=biou" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/bobgeorgethe3rd"><img src="https://avatars.githubusercontent.com/u/16866285?v=4?s=100" width="100px;" alt="bobgeorgethe3rd"/><br /><sub><b>bobgeorgethe3rd</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=bobgeorgethe3rd" title="Code">💻</a> <a href="https://github.com/freesewing/freesewing/commits?author=bobgeorgethe3rd" title="Documentation">📖</a> <a href="#design-bobgeorgethe3rd" title="Design">🎨</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/brmlyklr"><img src="https://avatars.githubusercontent.com/u/22308713?v=4?s=100" width="100px;" alt="brmlyklr"/><br /><sub><b>brmlyklr</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=brmlyklr" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="http://www.chrisbarrett.fr"><img src="https://avatars.githubusercontent.com/u/2373249?v=4?s=100" width="100px;" alt="chri5b"/><br /><sub><b>chri5b</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=chri5b" title="Code">💻</a> <a href="https://github.com/freesewing/freesewing/commits?author=chri5b" title="Tests">⚠️</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dingcycle"><img src="https://avatars.githubusercontent.com/u/1681985?v=4?s=100" width="100px;" alt="dingcycle"/><br /><sub><b>dingcycle</b></sub></a><br /><a href="#translation-dingcycle" title="Translation">🌍</a></td>
     </tr>
     <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/dingcycle"><img src="https://avatars.githubusercontent.com/u/1681985?v=4?s=100" width="100px;" alt="dingcycle"/><br /><sub><b>dingcycle</b></sub></a><br /><a href="#translation-dingcycle" title="Translation">🌍</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/drowned-in-books"><img src="https://avatars.githubusercontent.com/u/100040772?v=4?s=100" width="100px;" alt="drowned-in-books"/><br /><sub><b>drowned-in-books</b></sub></a><br /><a href="#question-drowned-in-books" title="Answering Questions">💬</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/econo202"><img src="https://avatars.githubusercontent.com/u/34138153?v=4?s=100" width="100px;" alt="econo202"/><br /><sub><b>econo202</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=econo202" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ericamattos"><img src="https://avatars.githubusercontent.com/u/4341417?v=4?s=100" width="100px;" alt="ericamattos"/><br /><sub><b>ericamattos</b></sub></a><br /><a href="#translation-ericamattos" title="Translation">🌍</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/fightingrabbit"><img src="https://avatars.githubusercontent.com/u/25751445?v=4?s=100" width="100px;" alt="fightingrabbit"/><br /><sub><b>fightingrabbit</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=fightingrabbit" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/DocSpencer77"><img src="https://avatars.githubusercontent.com/u/43393580?v=4?s=100" width="100px;" alt="gaylyndie"/><br /><sub><b>gaylyndie</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=DocSpencer77" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/grimlokason"><img src="https://avatars.githubusercontent.com/u/5112238?v=4?s=100" width="100px;" alt="grimlokason"/><br /><sub><b>grimlokason</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=grimlokason" title="Code">💻</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://weblog.redisdead.net"><img src="https://avatars.githubusercontent.com/u/6494414?v=4?s=100" width="100px;" alt="hellgy"/><br /><sub><b>hellgy</b></sub></a><br /><a href="#design-hellgy" title="Design">🎨</a></td>
     </tr>
     <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://weblog.redisdead.net"><img src="https://avatars.githubusercontent.com/u/6494414?v=4?s=100" width="100px;" alt="hellgy"/><br /><sub><b>hellgy</b></sub></a><br /><a href="#design-hellgy" title="Design">🎨</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/jackseye"><img src="https://avatars.githubusercontent.com/u/27834526?v=4?s=100" width="100px;" alt="jackseye"/><br /><sub><b>jackseye</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=jackseye" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/marckiesel"><img src="https://avatars.githubusercontent.com/u/39653780?v=4?s=100" width="100px;" alt="marckiesel"/><br /><sub><b>marckiesel</b></sub></a><br /><a href="#translation-marckiesel" title="Translation">🌍</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/Mesil"><img src="https://avatars.githubusercontent.com/u/14284175?v=4?s=100" width="100px;" alt="mesil"/><br /><sub><b>mesil</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/issues?q=author%3Amesil" title="Bug reports">🐛</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/starfetch"><img src="https://avatars.githubusercontent.com/u/80041179?v=4?s=100" width="100px;" alt="starfetch"/><br /><sub><b>starfetch</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=starfetch" title="Code">💻</a> <a href="https://github.com/freesewing/freesewing/commits?author=starfetch" title="Documentation">📖</a> <a href="#translation-starfetch" title="Translation">🌍</a> <a href="#design-starfetch" title="Design">🎨</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/timorl"><img src="https://avatars.githubusercontent.com/u/4363804?v=4?s=100" width="100px;" alt="timorl"/><br /><sub><b>timorl</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=timorl" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/ttimearl"><img src="https://avatars.githubusercontent.com/u/77916590?v=4?s=100" width="100px;" alt="ttimearl"/><br /><sub><b>ttimearl</b></sub></a><br /><a href="#content-ttimearl" title="Content">🖋</a></td>
-      <td align="center" valign="top" width="14.28%"><a href="https://github.com/chrisgloom"><img src="https://avatars.githubusercontent.com/u/15905991?v=4?s=100" width="100px;" alt="tuesgloomsday"/><br /><sub><b>tuesgloomsday</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=chrisgloom" title="Documentation">📖</a></td>
     </tr>
     <tr>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/chrisgloom"><img src="https://avatars.githubusercontent.com/u/15905991?v=4?s=100" width="100px;" alt="tuesgloomsday"/><br /><sub><b>tuesgloomsday</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=chrisgloom" title="Documentation">📖</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/valadaptive"><img src="https://avatars.githubusercontent.com/u/79560998?v=4?s=100" width="100px;" alt="valadaptive"/><br /><sub><b>valadaptive</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=valadaptive" title="Code">💻</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/viocky"><img src="https://avatars.githubusercontent.com/u/39279173?v=4?s=100" width="100px;" alt="viocky"/><br /><sub><b>viocky</b></sub></a><br /><a href="#translation-viocky" title="Translation">🌍</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/woolishboy"><img src="https://avatars.githubusercontent.com/u/57816321?v=4?s=100" width="100px;" alt="woolishboy"/><br /><sub><b>woolishboy</b></sub></a><br /><a href="https://github.com/freesewing/freesewing/commits?author=woolishboy" title="Code">💻</a></td>

plugins/plugin-annotations/src/index.mjs

@@ -4,9 +4,7 @@ import { crossbox } from './crossbox.mjs'
 import { cutonfold } from './cutonfold.mjs'
 import { grainline } from './grainline.mjs'
 import { logo } from './logo.mjs'
-import { scalebox } from './scalebox.mjs'
+import { scalebox, scalebox2 } from './scalebox.mjs'
-// import { miniscale } from './scalebox.mjs'
-import { miniscale } from './miniscale.mjs'
 import { notches } from './notches.mjs'
 import { pleat } from './pleat.mjs'
 import { sewtogether } from './sewtogether.mjs'
@@ -27,8 +25,6 @@ export const pluginPleat = pleat
 
 export const scaleboxPlugin = scalebox
 export const pluginScalebox = scalebox
-export const miniscalePlugin = miniscale
-export const pluginMiniscale = miniscale
 
 export const sewtogetherPlugin = sewtogether
 export const pluginSewtogether = sewtogether

plugins/plugin-annotations/src/miniscale.mjs

@@ -1,104 +0,0 @@
-import { name, version } from '../data.mjs'
-
-export const miniscale = {
-  name: 'miniscale',
-  version,
-  macros: {
-    miniscale(so, { store, points, paths, scale, Point, Path }) {
-      // Passing `false` will remove the miniscale
-      if (so === false) {
-        for (const id of [
-          '__miniscaleMetricTopLeft',
-          '__miniscaleMetricTopRight',
-          '__miniscaleMetricBottomRight',
-          '__miniscaleMetricBottomLeft',
-          '__miniscaleImperialTopLeft',
-          '__miniscaleImperialTopRight',
-          '__miniscaleImperialBottomRight',
-          '__miniscaleImperialBottomLeft',
-          '__miniscaleMetric',
-          '__miniscaleImperial',
-        ])
-          delete points[id]
-        for (const id of ['__miniscaleMetric', '__miniscaleImperial']) delete paths[id]
-        return true
-      }
-
-      // Convert scale to a value between 0 and 5, inclusive.
-      const scaleIndex = Math.ceil(6 * Math.max(0.1, Math.min(1, scale))) - 1
-
-      console.log({ MSat: so.at })
-
-      // Metric size in mm / display value and imperial size in mm / display value for each scale index.
-      const sizes = [
-        [10, '1cm', 25.4 * 0.375, '⅜″'],
-        [13, '1.3cm', 25.4 * 0.5, '½″'],
-        [16, '1.6cm', 25.4 * 0.625, '⅝″'],
-        [19, '1.9cm', 25.4 * 0.75, '¾″'],
-        [22, '2.2cm', 25.4 * 0.875, '⅞″'],
-        [25, '2.5cm', 25.4 * 1, '1″'],
-      ]
-      const m = sizes[scaleIndex][0] / 2
-      const i = sizes[scaleIndex][2] / 2
-      const metricDisplaySize = sizes[scaleIndex][1]
-      const imperialDisplaySize = sizes[scaleIndex][3]
-      // Box points
-      points.__miniscaleMetricTopLeft = new Point(so.at.x - m, so.at.y - m)
-      points.__miniscaleMetricTopRight = new Point(so.at.x + m, so.at.y - m)
-      points.__miniscaleMetricBottomLeft = new Point(so.at.x - m, so.at.y + m)
-      points.__miniscaleMetricBottomRight = new Point(so.at.x + m, so.at.y + m)
-      points.__miniscaleImperialTopLeft = new Point(so.at.x - i, so.at.y - i)
-      points.__miniscaleImperialTopRight = new Point(so.at.x + i, so.at.y - i)
-      points.__miniscaleImperialBottomLeft = new Point(so.at.x - i, so.at.y + i)
-      points.__miniscaleImperialBottomRight = new Point(so.at.x + i, so.at.y + i)
-      // Text anchor points
-      points.__miniscaleMetric = new Point(so.at.x, so.at.y - 2 * scale)
-      points.__miniscaleImperial = new Point(so.at.x, so.at.y + 8 * scale)
-      // Rotation
-      if (so.rotate) {
-        so.rotate = Number(so.rotate)
-        let toRotate = [
-          '__miniscaleMetricTopLeft',
-          '__miniscaleMetricTopRight',
-          '__miniscaleMetricBottomLeft',
-          '__miniscaleMetricBottomRight',
-          '__miniscaleImperialTopLeft',
-          '__miniscaleImperialTopRight',
-          '__miniscaleImperialBottomLeft',
-          '__miniscaleImperialBottomRight',
-          '__miniscaleMetric',
-          '__miniscaleImperial',
-        ]
-        for (const pid of toRotate) points[pid] = points[pid].rotate(so.rotate, so.at)
-        for (const pid of toRotate.slice(8)) {
-          points[pid].attributes.set(
-            'data-text-transform',
-            `rotate(${so.rotate * -1}, ${points[pid].x}, ${points[pid].y})`
-          )
-        }
-      }
-      // Paths
-      paths.__miniscaleImperial = new Path()
-        .attr('class', 'scalebox imperial fill-current')
-        .move(points.__miniscaleImperialTopLeft)
-        .line(points.__miniscaleImperialBottomLeft)
-        .line(points.__miniscaleImperialBottomRight)
-        .line(points.__miniscaleImperialTopRight)
-        .close()
-      paths.__miniscaleMetric = new Path()
-        .attr('class', 'scalebox metric fill-bg')
-        .move(points.__miniscaleMetricTopLeft)
-        .line(points.__miniscaleMetricBottomLeft)
-        .line(points.__miniscaleMetricBottomRight)
-        .line(points.__miniscaleMetricTopRight)
-        .close()
-      // Text
-      points.__miniscaleMetric = points.__miniscaleMetric
-        .attr('data-text', `${metricDisplaySize} x ${metricDisplaySize}`)
-        .attr('data-text-class', 'text-xs center')
-      points.__miniscaleImperial = points.__miniscaleImperial
-        .attr('data-text', `${imperialDisplaySize} x ${imperialDisplaySize}`)
-        .attr('data-text-class', 'text-xs center ')
-    },
-  },
-}

plugins/plugin-annotations/src/scalebox.mjs

@@ -50,8 +50,6 @@ export const scalebox = {
       const metricDisplayWidth = metricSizes[scaleIndex][2]
       const metricDisplayHeight = metricSizes[scaleIndex][3]
 
-      console.log({ SBat: so.at })
-
       // Imperial width and height in mm and display width and heigth for each scale index.
       const imperialSizes = [
         [25.4 * 0.5, 25.4 * 0.25, '½″', '¼″'],
@@ -191,5 +189,99 @@ export const scalebox = {
         .attr('data-text', `${imperialDisplayHeight}`)
         .attr('data-text-class', 'text-xs center ')
     },
+    miniscale(so, { store, points, paths, scale, Point, Path }) {
+      // Passing `false` will remove the miniscale
+      if (so === false) {
+        for (const id of [
+          '__miniscaleMetricTopLeft',
+          '__miniscaleMetricTopRight',
+          '__miniscaleMetricBottomRight',
+          '__miniscaleMetricBottomLeft',
+          '__miniscaleImperialTopLeft',
+          '__miniscaleImperialTopRight',
+          '__miniscaleImperialBottomRight',
+          '__miniscaleImperialBottomLeft',
+          '__miniscaleMetric',
+          '__miniscaleImperial',
+        ])
+          delete points[id]
+        for (const id of ['__miniscaleMetric', '__miniscaleImperial']) delete paths[id]
+        return true
+      }
+
+      // Convert scale to a value between 0 and 5, inclusive.
+      const scaleIndex = Math.ceil(6 * Math.max(0.1, Math.min(1, scale))) - 1
+
+      // Metric size in mm / display value and imperial size in mm / display value for each scale index.
+      const sizes = [
+        [10, '1cm', 25.4 * 0.375, '⅜″'],
+        [13, '1.3cm', 25.4 * 0.5, '½″'],
+        [16, '1.6cm', 25.4 * 0.625, '⅝″'],
+        [19, '1.9cm', 25.4 * 0.75, '¾″'],
+        [22, '2.2cm', 25.4 * 0.875, '⅞″'],
+        [25, '2.5cm', 25.4 * 1, '1″'],
+      ]
+      const m = sizes[scaleIndex][0] / 2
+      const i = sizes[scaleIndex][2] / 2
+      const metricDisplaySize = sizes[scaleIndex][1]
+      const imperialDisplaySize = sizes[scaleIndex][3]
+      // Box points
+      points.__miniscaleMetricTopLeft = new Point(so.at.x - m, so.at.y - m)
+      points.__miniscaleMetricTopRight = new Point(so.at.x + m, so.at.y - m)
+      points.__miniscaleMetricBottomLeft = new Point(so.at.x - m, so.at.y + m)
+      points.__miniscaleMetricBottomRight = new Point(so.at.x + m, so.at.y + m)
+      points.__miniscaleImperialTopLeft = new Point(so.at.x - i, so.at.y - i)
+      points.__miniscaleImperialTopRight = new Point(so.at.x + i, so.at.y - i)
+      points.__miniscaleImperialBottomLeft = new Point(so.at.x - i, so.at.y + i)
+      points.__miniscaleImperialBottomRight = new Point(so.at.x + i, so.at.y + i)
+      // Text anchor points
+      points.__miniscaleMetric = new Point(so.at.x, so.at.y - 2 * scale)
+      points.__miniscaleImperial = new Point(so.at.x, so.at.y + 8 * scale)
+      // Rotation
+      if (so.rotate) {
+        so.rotate = Number(so.rotate)
+        let toRotate = [
+          '__miniscaleMetricTopLeft',
+          '__miniscaleMetricTopRight',
+          '__miniscaleMetricBottomLeft',
+          '__miniscaleMetricBottomRight',
+          '__miniscaleImperialTopLeft',
+          '__miniscaleImperialTopRight',
+          '__miniscaleImperialBottomLeft',
+          '__miniscaleImperialBottomRight',
+          '__miniscaleMetric',
+          '__miniscaleImperial',
+        ]
+        for (const pid of toRotate) points[pid] = points[pid].rotate(so.rotate, so.at)
+        for (const pid of toRotate.slice(8)) {
+          points[pid].attributes.set(
+            'data-text-transform',
+            `rotate(${so.rotate * -1}, ${points[pid].x}, ${points[pid].y})`
+          )
+        }
+      }
+      // Paths
+      paths.__miniscaleImperial = new Path()
+        .attr('class', 'scalebox imperial fill-current')
+        .move(points.__miniscaleImperialTopLeft)
+        .line(points.__miniscaleImperialBottomLeft)
+        .line(points.__miniscaleImperialBottomRight)
+        .line(points.__miniscaleImperialTopRight)
+        .close()
+      paths.__miniscaleMetric = new Path()
+        .attr('class', 'scalebox metric fill-bg')
+        .move(points.__miniscaleMetricTopLeft)
+        .line(points.__miniscaleMetricBottomLeft)
+        .line(points.__miniscaleMetricBottomRight)
+        .line(points.__miniscaleMetricTopRight)
+        .close()
+      // Text
+      points.__miniscaleMetric = points.__miniscaleMetric
+        .attr('data-text', `${metricDisplaySize} x ${metricDisplaySize}`)
+        .attr('data-text-class', 'text-xs center')
+      points.__miniscaleImperial = points.__miniscaleImperial
+        .attr('data-text', `${imperialDisplaySize} x ${imperialDisplaySize}`)
+        .attr('data-text-class', 'text-xs center ')
+    },
   },
 }