.devcontainer/devcontainer.json

@@ -30,8 +30,7 @@
         "vscode": {
             "extensions": [
                 "Gruntfuggly.todo-tree",
-                "mhutchie.git-graph",
+                "mhutchie.git-graph"
-                "timonwong.shellcheck"
             ]
         }
     },

Dockerfile

@@ -1,25 +0,0 @@
-FROM docker.io/ldericher/autodoc:0.8-diagram
-
-# install pdfa tools as per https://stackoverflow.com/a/39420880
-COPY --chown=root:root \
-    deploy/pdfa \
-    /opt/pdfa
-
-# install TeXoffice
-COPY --chown=root:root \
-    deploy/texoffice \
-    /opt/texlive/texdir/texmf-dist/tex/latex/texoffice
-
-# install lenaisten directory
-COPY --chown=root:root \
-    src/lenaisten \
-    /opt/lenaisten
-
-# install pandoc templates
-COPY --chown=root:root \
-    src/lev-protokoll.latex \
-    /usr/local/share/pandoc/templates
-
-RUN set -ex; \
-    # reindex TeXlive (installed TeXoffice)
-    /opt/texlive/texdir/bin/default/texconfig rehash;

deploy/publish

@@ -1,10 +0,0 @@
-#!/bin/sh
-
-script="$( readlink -f "${0}" )"
-script_dir="$( dirname "${script}" )"
-
-docker buildx build \
-    --pull --push \
-    --tag "code.lenaisten.de/lenaisten/lev-templates:latest" \
-    --platform "linux/amd64" \
-    "${script_dir}/.."

src/lenaisten/redact.py

@@ -15,8 +15,8 @@ txt = Path(args.file).read_text()
 
 # redaction syntax
 import re
-inlinepat = re.compile(r"\(\(\((?:(.+?):::)?(.+?)\)\)\)", re.MULTILINE|re.DOTALL)
+inlinepat = re.compile(r"\(\(\((([^>]*?):::)?(.*?)\)\)\)", re.MULTILINE|re.DOTALL)
-tokenpat  = re.compile(r"\[redact(:::(.+?))?\](.+?)\[\/redact\]", re.MULTILINE|re.DOTALL)
+tokenpat  = re.compile(r"\[redact(:::(.*?))?\](.*?)\[\/redact\]", re.MULTILINE|re.DOTALL)
 
 # match handling
 def subredact(match):