t-doc-common 0.6.dev2__tar.gz → 0.8__tar.gz

{t_doc_common-0.6.dev2 → t_doc_common-0.8}/.gitignore

@@ -1,4 +1,3 @@
-*.gen.*
 *.orig
 __pycache__
 
@@ -6,4 +5,5 @@ __pycache__
 /_build/
 /dist/
 /node_modules/
+/tdoc/common/static.gen/
 /tmp/

{t_doc_common-0.6.dev2 → t_doc_common-0.8}/.hgignore

@@ -1,5 +1,4 @@
 syntax: glob
-*.gen.*
 *.orig
 __pycache__
 
@@ -8,4 +7,5 @@ syntax: regexp
 ^_build/
 ^dist/
 ^node_modules/
+^tdoc/common/static\.gen/
 ^tmp/

{t_doc_common-0.6.dev2 → t_doc_common-0.8}/.hgtags

@@ -2,3 +2,6 @@
 ea2973414a3779c7ffbed73279ab8d811c795268 0.3
 dcb01efb897d0e04063b92998c17b02b587761c7 0.4
 e4ac6c10dd9194ff48c95d82e462e45bbd651ef1 0.5
+145a6ae1f8e1a445a9a13c687c17bf587b48522f 0.6
+f5adc3e31d10e2b5478fe2e041b936159dd5c1c0 0.7
+23e15db6feceb801732e75bd5de0a56a7c4b06d0 0.8

{t_doc_common-0.6.dev2 → t_doc_common-0.8}/LICENSES.deps.txt

@@ -233,12 +233,12 @@ THE SOFTWARE.
 
 ---
 
-Name: @codemirror/commands
-Version: 6.6.1
+Name: @codemirror/autocomplete
+Version: 6.18.0
 License: MIT
 Private: false
-Description: Collection of editing commands for the CodeMirror code editor
-Repository: https://github.com/codemirror/commands.git
+Description: Autocompletion for the CodeMirror code editor
+Repository: https://github.com/codemirror/autocomplete.git
 Author: Marijn Haverbeke <marijn@haverbeke.berlin> (http://marijnhaverbeke.nl)
 License Copyright:
 ===
@@ -267,18 +267,19 @@ THE SOFTWARE.
 
 ---
 
-Name: crelt
-Version: 1.0.6
+Name: @codemirror/commands
+Version: 6.6.1
 License: MIT
 Private: false
-Description: Tiny DOM-element-creation utility
-Repository: git+https://github.com/marijnh/crelt.git
-Homepage: https://github.com/marijnh/crelt#readme
-Author: Marijn Haverbeke <marijn@haverbeke.berlin>
+Description: Collection of editing commands for the CodeMirror code editor
+Repository: https://github.com/codemirror/commands.git
+Author: Marijn Haverbeke <marijn@haverbeke.berlin> (http://marijnhaverbeke.nl)
 License Copyright:
 ===
 
-Copyright (C) 2020 by Marijn Haverbeke <marijn@haverbeke.berlin>
+MIT License
+
+Copyright (C) 2018-2021 by Marijn Haverbeke <marijn@haverbeke.berlin> and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -300,19 +301,18 @@ THE SOFTWARE.
 
 ---
 
-Name: @codemirror/search
-Version: 6.5.6
+Name: crelt
+Version: 1.0.6
 License: MIT
 Private: false
-Description: Search functionality for the CodeMirror code editor
-Repository: https://github.com/codemirror/search.git
-Author: Marijn Haverbeke <marijn@haverbeke.berlin> (http://marijnhaverbeke.nl)
+Description: Tiny DOM-element-creation utility
+Repository: git+https://github.com/marijnh/crelt.git
+Homepage: https://github.com/marijnh/crelt#readme
+Author: Marijn Haverbeke <marijn@haverbeke.berlin>
 License Copyright:
 ===
 
-MIT License
-
-Copyright (C) 2018-2021 by Marijn Haverbeke <marijn@haverbeke.berlin> and others
+Copyright (C) 2020 by Marijn Haverbeke <marijn@haverbeke.berlin>
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -334,12 +334,12 @@ THE SOFTWARE.
 
 ---
 
-Name: @codemirror/autocomplete
-Version: 6.18.0
+Name: @codemirror/lint
+Version: 6.8.1
 License: MIT
 Private: false
-Description: Autocompletion for the CodeMirror code editor
-Repository: https://github.com/codemirror/autocomplete.git
+Description: Linting support for the CodeMirror code editor
+Repository: https://github.com/codemirror/lint.git
 Author: Marijn Haverbeke <marijn@haverbeke.berlin> (http://marijnhaverbeke.nl)
 License Copyright:
 ===
@@ -368,12 +368,12 @@ THE SOFTWARE.
 
 ---
 
-Name: @codemirror/lint
-Version: 6.8.1
+Name: @codemirror/search
+Version: 6.5.6
 License: MIT
 Private: false
-Description: Linting support for the CodeMirror code editor
-Repository: https://github.com/codemirror/lint.git
+Description: Search functionality for the CodeMirror code editor
+Repository: https://github.com/codemirror/search.git
 Author: Marijn Haverbeke <marijn@haverbeke.berlin> (http://marijnhaverbeke.nl)
 License Copyright:
 ===
@@ -402,19 +402,19 @@ THE SOFTWARE.
 
 ---
 
-Name: codemirror
-Version: 6.0.1
+Name: @codemirror/theme-one-dark
+Version: 6.1.2
 License: MIT
 Private: false
-Description: Basic configuration for the CodeMirror code editor
-Repository: https://github.com/codemirror/basic-setup.git
-Author: Marijn Haverbeke <marijnh@gmail.com> (http://marijnhaverbeke.nl)
+Description: One Dark theme for the CodeMirror code editor
+Repository: https://github.com/codemirror/theme-one-dark.git
+Author: Marijn Haverbeke <marijn@haverbeke.berlin> (http://marijnhaverbeke.nl)
 License Copyright:
 ===
 
 MIT License
 
-Copyright (C) 2018-2021 by Marijn Haverbeke <marijnh@gmail.com> and others
+Copyright (C) 2018-2021 by Marijn Haverbeke <marijn@haverbeke.berlin> and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -572,19 +572,19 @@ THE SOFTWARE.
 
 ---
 
-Name: @codemirror/lang-html
-Version: 6.4.9
+Name: @lezer/javascript
+Version: 1.4.17
 License: MIT
 Private: false
-Description: HTML language support for the CodeMirror code editor
-Repository: https://github.com/codemirror/lang-html.git
-Author: Marijn Haverbeke <marijn@haverbeke.berlin> (http://marijnhaverbeke.nl)
+Description: lezer-based JavaScript grammar
+Repository: https://github.com/lezer-parser/javascript.git
+Author: Marijn Haverbeke <marijn@haverbeke.berlin>
 License Copyright:
 ===
 
 MIT License
 
-Copyright (C) 2018-2021 by Marijn Haverbeke <marijn@haverbeke.berlin> and others
+Copyright (C) 2018 by Marijn Haverbeke <marijn@haverbeke.berlin> and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -606,19 +606,19 @@ THE SOFTWARE.
 
 ---
 
-Name: @lezer/javascript
-Version: 1.4.17
+Name: @codemirror/lang-javascript
+Version: 6.2.2
 License: MIT
 Private: false
-Description: lezer-based JavaScript grammar
-Repository: https://github.com/lezer-parser/javascript.git
-Author: Marijn Haverbeke <marijn@haverbeke.berlin>
+Description: JavaScript language support for the CodeMirror code editor
+Repository: https://github.com/codemirror/lang-javascript.git
+Author: Marijn Haverbeke <marijn@haverbeke.berlin> (http://marijnhaverbeke.nl)
 License Copyright:
 ===
 
 MIT License
 
-Copyright (C) 2018 by Marijn Haverbeke <marijn@haverbeke.berlin> and others
+Copyright (C) 2018-2021 by Marijn Haverbeke <marijn@haverbeke.berlin> and others
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -640,12 +640,12 @@ THE SOFTWARE.
 
 ---
 
-Name: @codemirror/lang-javascript
-Version: 6.2.2
+Name: @codemirror/lang-html
+Version: 6.4.9
 License: MIT
 Private: false
-Description: JavaScript language support for the CodeMirror code editor
-Repository: https://github.com/codemirror/lang-javascript.git
+Description: HTML language support for the CodeMirror code editor
+Repository: https://github.com/codemirror/lang-html.git
 Author: Marijn Haverbeke <marijn@haverbeke.berlin> (http://marijnhaverbeke.nl)
 License Copyright:
 ===

{t_doc_common-0.6.dev2 → t_doc_common-0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: t-doc-common
-Version: 0.6.dev2
+Version: 0.8
 Summary: Common functionality for t-doc
 Project-URL: Code, https://github.com/t-docs/common
 Project-URL: Documentation, https://t-doc.org/common/

t_doc_common-0.8/docs/demo/people.sql

@@ -0,0 +1,11 @@
+create table people (
+  first_name text not null,
+  last_name text not null,
+  height real,
+  favorite_food text
+);
+insert into people values
+  ('Joe', 'Bar', 1.83, null),
+  ('Jack', 'Smith', 1.55, 'burgers'),
+  ('Jim', 'Davis', null, 'pizza'),
+  ('Anthony', 'Miller', 1.78, null);

{t_doc_common-0.6.dev2 → t_doc_common-0.8}/docs/demo/sql.md

@@ -15,16 +15,24 @@ described below.
 
 {.rubric}
 Options
-```{rst:directive:option} after: name
+```{rst:directive:option} after: name [name...]
 :type: text
-References an `{exec}` block to be executed before this block, in the same
-environment. The referenced block can itself have an `:after:` option, forming
-a chain of blocks to execute in the environment.
+References one or more `{exec}` blocks to be executed before this block, in the
+same environment. The referenced blocks can themselves have an `:after:` option,
+forming a tree of blocks to execute in the environment. If a block appears on
+more than one tree branch, only the first occurrence is executed.
+```
+```{rst:directive:option} editable
+When set, the `{exec}` block is made editable.
+```
+```{rst:directive:option} include: path [path...]
+:type: relative paths
+When set, prepend the content of one or more files to the block's content.
 ```
 ```{rst:directive:option} when: value
 :type: click | load | never
-Determines when the block's code is executed: on a click by the user (`click`),
-when the page loads (`load`) or not at all (`never`).
+Determines when the block's code is executed: on user request (`click`, the
+default), when the page loads (`load`) or not at all (`never`).
 ```
 ````
 
@@ -37,20 +45,20 @@ A database can be defined as a named `{exec} sql` block, to be referenced in the
 :name: sql-countries
 :when: never
 create table countries (
-    country text not null,
-    country_code text not null,
-    dial_code text not null,
-    capital text not null,
-    population int not null,
-    food text
+  country text not null,
+  country_code text not null,
+  dial_code text not null,
+  capital text not null,
+  population int not null,
+  food text
 );
 insert into countries values
-    ('Switzerland', 'CH', '+41', 'Bern', 8776000, 'fondue!'),
-    ('France', 'FR', '+33', 'Paris', 67970000, null),
-    ('Germany', 'DE', '+49', 'Berlin', 83800000, null),
-    ('Italy', 'IT', '+39', 'Rome', 58940000, null),
-    ('Austria', 'AT', '+43', 'Vienna', 9042000, 'Kaiserschmarrn'),
-    ('Lichtenstein', 'LI', '+423', 'Vaduz', 39327, null);
+  ('Switzerland', 'CH', '+41', 'Bern', 8776000, 'fondue!'),
+  ('France', 'FR', '+33', 'Paris', 67970000, null),
+  ('Germany', 'DE', '+49', 'Berlin', 83800000, null),
+  ('Italy', 'IT', '+39', 'Rome', 58940000, null),
+  ('Austria', 'AT', '+43', 'Vienna', 9042000, 'Kaiserschmarrn'),
+  ('Lichtenstein', 'LI', '+423', 'Vaduz', 39327, null);
 ```
 
 ## Queries
@@ -110,3 +118,27 @@ select * from countries where country_code = 'LI';
 They can also be executed immediately on load (`:when: load`) or not at all
 (`:when: never`, useful for database definitions that are referenced by other
 blocks). In these cases, no controls aren displayed.
+
+## Editable blocks
+
+Blocks can be made editable with the `:editable:` option.
+
+```{exec} sql
+:after: sql-countries
+:when: load
+:editable:
+select * from countries
+  where population > 10000000
+  order by country_code;
+```
+
+## Include file content
+
+Blocks can reference one or more external files to be included. The content of
+the files is prepended to the block's content.
+
+```{exec} sql
+:include: people.sql
+:when: load
+select * from people;
+```

{t_doc_common-0.6.dev2 → t_doc_common-0.8}/docs/install.md

@@ -114,6 +114,14 @@ t-doc requires the following software to be installed:
   ```{code-block} shell-session
   python -m pip install --upgrade t-doc-common
   ```
+  If you get the following error, then a [local server](edit.md#edit-documents)
+  is running. Stop it with {kbd}`Ctrl+C` or by closing its terminal window, then
+  try again.
+  ```
+  ERROR: Could not install packages due to an OSError: [WinError 32] The process
+  cannot access the file because it is being used by another process:
+  'c:\\users\\...\\scripts\\tdoc.exe'
+  ```
   ````
   ````{tab-item} macOS
   :sync: macos

{t_doc_common-0.6.dev2 → t_doc_common-0.8}/package-lock.json

@@ -6,15 +6,21 @@
     "": {
       "name": "t-doc-common",
       "devDependencies": {
+        "@codemirror/autocomplete": "^6.18.0",
+        "@codemirror/commands": "^6.6.1",
         "@codemirror/lang-css": "^6.2.1",
         "@codemirror/lang-html": "^6.4.9",
         "@codemirror/lang-javascript": "^6.2.2",
         "@codemirror/lang-python": "^6.1.6",
         "@codemirror/lang-sql": "^6.7.1",
+        "@codemirror/language": "^6.10.2",
+        "@codemirror/lint": "^6.8.1",
+        "@codemirror/search": "^6.5.6",
+        "@codemirror/state": "^6.4.1",
+        "@codemirror/theme-one-dark": "^6.1.2",
         "@codemirror/view": "^6.33.0",
         "@rollup/plugin-node-resolve": "^15.2.3",
         "@sqlite.org/sqlite-wasm": "^3.46.1-build1",
-        "codemirror": "^6.0.1",
         "rollup": "^4.21.2",
         "rollup-plugin-license": "^3.5.2"
       }
@@ -174,6 +180,19 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@codemirror/theme-one-dark": {
+      "version": "6.1.2",
+      "resolved": "https://registry.npmjs.org/@codemirror/theme-one-dark/-/theme-one-dark-6.1.2.tgz",
+      "integrity": "sha512-F+sH0X16j/qFLMAfbciKTxVOwkdAS336b7AXTKOZhy8BR3eH/RelsnLgLFINrpST63mmN2OuwUt0W2ndUgYwUA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@codemirror/language": "^6.0.0",
+        "@codemirror/state": "^6.0.0",
+        "@codemirror/view": "^6.0.0",
+        "@lezer/highlight": "^1.0.0"
+      }
+    },
     "node_modules/@codemirror/view": {
       "version": "6.33.0",
       "resolved": "https://registry.npmjs.org/@codemirror/view/-/view-6.33.0.tgz",
@@ -588,22 +607,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/codemirror": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/codemirror/-/codemirror-6.0.1.tgz",
-      "integrity": "sha512-J8j+nZ+CdWmIeFIGXEFbFPtpiYacFMDR8GlHK3IyHQJMCaVRfGx9NT+Hxivv1ckLWPvNdZqndbr/7lVhrf/Svg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@codemirror/autocomplete": "^6.0.0",
-        "@codemirror/commands": "^6.0.0",
-        "@codemirror/language": "^6.0.0",
-        "@codemirror/lint": "^6.0.0",
-        "@codemirror/search": "^6.0.0",
-        "@codemirror/state": "^6.0.0",
-        "@codemirror/view": "^6.0.0"
-      }
-    },
     "node_modules/commenting": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/commenting/-/commenting-1.1.0.tgz",

{t_doc_common-0.6.dev2 → t_doc_common-0.8}/package.json

@@ -1,16 +1,20 @@
 {
-  "dependencies": {
-  },
   "devDependencies": {
+    "@codemirror/autocomplete": "^6.18.0",
+    "@codemirror/commands": "^6.6.1",
     "@codemirror/lang-css": "^6.2.1",
     "@codemirror/lang-html": "^6.4.9",
     "@codemirror/lang-javascript": "^6.2.2",
     "@codemirror/lang-python": "^6.1.6",
     "@codemirror/lang-sql": "^6.7.1",
+    "@codemirror/language": "^6.10.2",
+    "@codemirror/lint": "^6.8.1",
+    "@codemirror/search": "^6.5.6",
+    "@codemirror/state": "^6.4.1",
+    "@codemirror/theme-one-dark": "^6.1.2",
     "@codemirror/view": "^6.33.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
     "@sqlite.org/sqlite-wasm": "^3.46.1-build1",
-    "codemirror": "^6.0.1",
     "rollup": "^4.21.2",
     "rollup-plugin-license": "^3.5.2"
   },

{t_doc_common-0.6.dev2 → t_doc_common-0.8}/pyproject.toml

@@ -53,10 +53,14 @@ path = "tools/hatch_hooks.py"
 path = "tools/hatch_hooks.py"
 
 [tool.hatch.build.targets.sdist]
+artifacts = [
+    "/tdoc/common/static.gen/",
+]
 
 [tool.hatch.build.targets.wheel]
 only-include = [
-    "ext/sqlite-wasm/sqlite-wasm/jswasm",
     "tdoc",
 ]
-sources."ext/sqlite-wasm/sqlite-wasm" = "tdoc/common/static"
+artifacts = [
+    "/tdoc/common/static.gen/",
+]

{t_doc_common-0.6.dev2 → t_doc_common-0.8}/rollup.config.mjs

@@ -1,8 +1,8 @@
 // Copyright 2024 Remy Blank <remy@c-space.org>
 // SPDX-License-Identifier: MIT
 
-import path from 'node:path';
-import url from 'node:url';
+import * as path from 'node:path';
+import * as url from 'node:url';
 import resolve from '@rollup/plugin-node-resolve';
 import license from 'rollup-plugin-license';
 
@@ -11,29 +11,23 @@ import license from 'rollup-plugin-license';
 const __filename = import.meta.filename || url.fileURLToPath(import.meta.url)
 const __dirname = import.meta.dirname || path.dirname(__filename)
 
+// TODO: Package @sqlite.org/sqlite-wasm. Or maybe it must be an external
+//       because of the worker module and .wasm.
+
 export default {
     input: "./tdoc/common/scripts/tdoc-editor.js",
     output: {
-        chunkFileNames: '[name].gen.js',
+        chunkFileNames: '[name].js',
         compact: true,
-        dir: './tdoc/common/static/',
-        entryFileNames: '[name].gen.js',
+        dir: './tdoc/common/static.gen/',
+        entryFileNames: '[name].js',
         format: 'es',
         generatedCode: {
             arrowFunctions: true,
             constBindings: true,
             objectShorthand: true,
         },
-        // TODO: Package @sqlite.org/sqlite-wasm as well. Or maybe it must
-        //       be an external because of the worker module and .wasm
-        manualChunks: {
-            'tdoc-cm': ['codemirror'],
-            'tdoc-cm-css': ['@codemirror/lang-css'],
-            'tdoc-cm-html': ['@codemirror/lang-html'],
-            'tdoc-cm-javascript': ['@codemirror/lang-javascript'],
-            'tdoc-cm-python': ['@codemirror/lang-python'],
-            'tdoc-cm-sql': ['@codemirror/lang-sql'],
-        },
+        manualChunks: {},
     },
     plugins: [
         resolve(),

{t_doc_common-0.6.dev2 → t_doc_common-0.8}/tdoc/common/__init__.py

@@ -4,13 +4,13 @@
 import pathlib
 import re
 
-from docutils import nodes
+from docutils import nodes, statemachine
 from docutils.parsers.rst import directives
 from sphinx.directives.code import CodeBlock
 from sphinx.util import logging
 
 __project__ = 't-doc-common'
-__version__ = '0.6.dev2'
+__version__ = '0.8'
 
 _common = pathlib.Path(__file__).absolute().parent
 _root = _common.parent.parent
@@ -48,6 +48,20 @@ def setup(app):
     }
 
 
+def report_exceptions(fn):
+    def wrapper(self, /, *args, **kwargs):
+        try:
+            return fn(self, *args, **kwargs)
+        except Exception as e:
+            return [self.state.document.reporter.warning(e, line=self.lineno)]
+    return wrapper
+
+
+def format_data_attrs(translator, /, **kwargs):
+    return ' '.join(f'data-tdoc-{k}="{translator.attval(v)}"'
+                    for k, v in sorted(kwargs.items()) if v is not None)
+
+
 def on_config_inited(app, config):
     cv = config.values['html_title']
     super(cv.__class__, cv).__setattr__('default', lambda c: c.project)
@@ -65,9 +79,11 @@ def on_config_inited(app, config):
 def on_builder_inited(app):
     # Add our own static paths.
     app.config.html_static_path.append(str(_common / 'static'))
-    sw = _root / 'ext' / 'sqlite-wasm' / 'sqlite-wasm'
-    if (sw / 'jswasm').is_dir():
-        app.config.html_static_path.append(str(sw))
+    app.config.html_static_path.append(str(_common / 'static.gen'))
+    sqlite_path = (_root / 'node_modules' / '@sqlite.org' / 'sqlite-wasm'
+                   / 'sqlite-wasm' / 'jswasm')
+    if sqlite_path.is_dir():
+        app.config.html_static_path.append(str(sqlite_path))
 
 
 def on_html_page_context(app, page, template, context, doctree):
@@ -82,19 +98,16 @@ def on_html_page_context(app, page, template, context, doctree):
         # TODO: Work around inability to specify headers on GitHub Pages
 
 
-def format_data_attrs(translator, /, **kwargs):
-    return ' '.join(f'data-tdoc-{k}="{translator.attval(v)}"'
-                    for k, v in sorted(kwargs.items()) if v is not None)
-
-
 class ExecBlock(nodes.literal_block): pass
 
 
 class Exec(CodeBlock):
-    # TODO: :include:
+    # TODO: Validate the language against the list of supported languages
 
     option_spec = CodeBlock.option_spec | {
-        'after': directives.unchanged,
+        'after': directives.class_option,
+        'editable': directives.flag,
+        'include': directives.unchanged_required,
         'when': lambda c: directives.choice(c, ('click', 'load', 'never')),
     }
 
@@ -104,12 +117,21 @@ class Exec(CodeBlock):
                          and 'tdoc-exec' in n['classes'] \
                          and (lang is None or n.get('language') == lang)
 
+    @report_exceptions
     def run(self):
+        if include := self.options.get('include'):
+            content = statemachine.StringList()
+            for path in include.split():
+                rel_path, path = self.env.relfn2path(path)
+                self.env.note_dependency(rel_path)
+                content.extend(statemachine.StringList(
+                    initlist=pathlib.Path(path).read_text().splitlines(),
+                    source=path))
+            self.content[:0] = content
         res = super().run()
         for node in res:
             for n in node.findall(nodes.literal_block):
                 self._update_node(node)
-        # _log.info("res: %s", res, color='yellow')
         return res
 
     def _update_node(self, node):
@@ -119,6 +141,8 @@ class Exec(CodeBlock):
         if after := self.options.get('after'):
             node['after'] = after
         node['when'] = self.options.get('when', 'click')
+        if 'editable' in self.options:
+            node['classes'] += ['tdoc-editable']
 
 
 def check_after_references(app, doctree, docname):
@@ -127,10 +151,10 @@ def check_after_references(app, doctree, docname):
     for n in nodes:
         names.update(n['names'])
     for n in nodes:
-        after = n.get('after')
-        if after and after not in names:
-            doctree.reporter.error(
-                f"'exec': Unknown :after: reference: {after}", base_node=n)
+        for after in n.get('after', ()):
+            if after not in names:
+                doctree.reporter.error(
+                    f"'exec': Unknown :after: reference: {after}", base_node=n)
 
 
 div_attrs_re = re.compile(r'(?s)^(<div[^>]*)(>.*)$')
@@ -140,8 +164,10 @@ def visit_ExecBlock(self, node):
     try:
         return self.visit_literal_block(node)
     except nodes.SkipNode:
-        attrs = format_data_attrs(self, after=node.get('after'),
-                                  when=node.get('when'))
+        after = node.get('after')
+        attrs = format_data_attrs(
+            self, after=' '.join(after) if after else None,
+            when=node.get('when'))
         if attrs:
             def subst(m):
                 return f'{m.group(1)} {attrs}{m.group(2)}'