Merge branch 'main' into parsing-2

Author: bosschaert

.github/workflows/dependabot.yaml

@@ -0,0 +1,23 @@
+name: Dependabot auto-merge
+on: pull_request
+
+permissions:
+  contents: write
+  pull-requests: write
+
+jobs:
+  dependabot:
+    runs-on: ubuntu-latest
+    if: github.actor == 'dependabot[bot]'
+    steps:
+      - name: Dependabot metadata
+        id: metadata
+        uses: dependabot/fetch-metadata@v2
+        with:
+          github-token: "${{ secrets.GITHUB_TOKEN }}"
+      - name: Enable auto-merge for Dependabot PRs
+        if: steps.metadata.outputs.update-type == 'version-update:semver-patch'
+        run: gh pr merge --auto --merge "$PR_URL"
+        env:
+          PR_URL: ${{github.event.pull_request.html_url}}
+          GH_TOKEN: ${{secrets.GITHUB_TOKEN}}

blocks/edit/da-editor/da-editor.css

@@ -260,6 +260,14 @@ span.ProseMirror-menuseparator {
   background: url('/blocks/edit/img/Smock_TextItalic_18_N.svg') center / 18px no-repeat var(--editor-btn-bg-color);
 }
 
+.edit-sup {
+  background: url('/blocks/edit/img/Smock_TextSuperscript_18_N.svg') center / 18px no-repeat #EFEFEF;
+}
+
+.edit-sub {
+  background: url('/blocks/edit/img/Smock_TextSubscript_18_N.svg') center / 18px no-repeat #EFEFEF;
+}
+
 .edit-link {
   background: url('/blocks/edit/img/Smock_Link_18_N.svg') center / 18px no-repeat var(--editor-btn-bg-color);
 }

blocks/edit/img/Smock_TextSubscript_18_N.svg

@@ -36,16 +36,33 @@ import { addLocNodes, getLocClass } from './loc-utils.js';
 
 const DA_ORIGIN = getDaAdmin();
 
+function addCustomMarks(marks) {
+  const sup = {
+    parseDOM: [{ tag: 'sup' }, { clearMark: (m) => m.type.name === 'sup' }],
+    toDOM() { return ['sup', 0]; },
+  };
+
+  const sub = {
+    parseDOM: [{ tag: 'sub' }, { clearMark: (m) => m.type.name === 'sub' }],
+    toDOM() { return ['sub', 0]; },
+  };
+
+  const contextHighlight = { toDOM: () => ['span', { class: 'highlighted-context' }, 0] };
+
+  return marks
+    .addToEnd('sup', sup)
+    .addToEnd('sub', sub)
+    .addToEnd('contextHighlightingMark', contextHighlight);
+}
+
 // Note: until getSchema() is separated in its own module, this function needs to be kept in-sync
 // with the getSchema() function in da-collab src/collab.js
 export function getSchema() {
   const { marks, nodes: baseNodes } = baseSchema.spec;
   const withLocNodes = addLocNodes(baseNodes);
   const withListnodes = addListNodes(withLocNodes, 'block+', 'block');
   const nodes = withListnodes.append(tableNodes({ tableGroup: 'block', cellContent: 'block+' }));
-  const contextHighlightingMark = { toDOM: () => ['span', { class: 'highlighted-context' }, 0] };
-  const customMarks = marks.addToEnd('contextHighlightingMark', contextHighlightingMark);
-  return new Schema({ nodes, marks: customMarks });
+  return new Schema({ nodes, marks: addCustomMarks(marks) });
 }
 
 let sendUpdates = false;

blocks/edit/img/Smock_TextSuperscript_18_N.svg

@@ -281,6 +281,16 @@ function getTextBlocks(marks, nodes) {
       label: 'I',
       class: 'edit-italic',
     }),
+    markItem(marks.sup, {
+      title: 'Toggle superscript',
+      label: 'SUP',
+      class: 'edit-sup',
+    }),
+    markItem(marks.sub, {
+      title: 'Toggle subscript',
+      label: 'SUB',
+      class: 'edit-sub',
+    }),
     item('separator', null, 'separator'),
     blockTypeItem(nodes.paragraph, {
       title: 'Change to paragraph',