From fc8b8daa5063bd64e94c8024a2b879eebb08923c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20Ke=C3=9Fler=20=28via=20gitlab=20runner=29?= Date: Thu, 10 Feb 2022 00:27:09 +0000 Subject: [PATCH] improve code package: deactivate | symbol in tables. make | and code usable inside other macros by rescanning the token list Build branch master (0a902cc) from kesslermaximilian/LatexPackages --- build_info.json | 12 ++++++------ wip/code/mkessler-code.sty | 23 +++++++++-------------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/build_info.json b/build_info.json index d1c53d1..b072225 100644 --- a/build_info.json +++ b/build_info.json @@ -1,8 +1,8 @@ { "build_time": "", "source files": { - "version": "v2.9-4-g371ce76", - "commit": "371ce76a81138a9ba73676a41190c71ecd2b5748", + "version": "v2.9-5-g0a902cc", + "commit": "0a902cc0ecbccd9c4f50b99faf8e73f0b3ab5648", "dirty": false }, "pytex": { @@ -36,12 +36,12 @@ { "name": "wip/code/mkessler-code.sty", "source file": "wip/code/code.pysty", - "build time": "2022/02/10 00:14", - "source version": "v2.9-4-g371ce76", - "source commit hash": "371ce76a81138a9ba73676a41190c71ecd2b5748", + "build time": "2022/02/10 00:27", + "source version": "v2.9-5-g0a902cc", + "source commit hash": "0a902cc0ecbccd9c4f50b99faf8e73f0b3ab5648", "pytex version": "v1.2.0-31-gc9bb0e8", "pytex commit hash": "c9bb0e87c91beae3e17a829603e4459cf804ec51", - "md5sum": "68ded87bc3cbb44e2c3ff6874eda1a5e", + "md5sum": "1bdb9ea56b85112b1ef80f59fcaff51d", "dirty": false }, { diff --git a/wip/code/mkessler-code.sty b/wip/code/mkessler-code.sty index e9d5f56..60f90fe 100644 --- a/wip/code/mkessler-code.sty +++ b/wip/code/mkessler-code.sty @@ -31,7 +31,7 @@ % % Build details: % PyTeX version: v1.2.0-31-gc9bb0e8 (commit c9bb0e8) -% Source code version: v2.9-4-g371ce76 (commit 371ce76) +% Source code version: v2.9-5-g0a902cc (commit 0a902cc) % % This LaTeX package is free software and is dual-licensed % under the LPPLv1.3c and the GPLv3 licenses. @@ -55,6 +55,9 @@ \DeclareOption{pipe}{\mkessler@code@pipetrue} \ProcessOptions + +% This is needed in general: when _ is active, we want it to expand to +% an actual _ character \catcode`_=13 \let_\_ \catcode`_=8 @@ -71,20 +74,12 @@ } \ExplSyntaxOff -\newif\ifactive\activefalse \ifmkessler@code@pipe \catcode`|=\active - \def|{ - \ifactive - \endgroup - \activefalse - \else - \begingroup - \catcode`_=13 - \ttfamily - \fi + \def|#1|{ + \code{#1} } -% Quick fix for tables -\AddToHook{env/tabular/begin}[code]{\catcode`|=13} -\AddToHook{env/tabular/end}[code]{\catcode`|=8} +% Do not make | active inside tables +\AddToHook{env/tabular/before}[code]{\catcode`|=12} +\AddToHook{env/tabular/after}[code]{\catcode`|=13} \fi