diff --git a/papers/tex/markdown-wrapper.tex b/papers/tex/markdown-wrapper.tex index 9c64feb7..513482f5 100644 --- a/papers/tex/markdown-wrapper.tex +++ b/papers/tex/markdown-wrapper.tex @@ -29,6 +29,7 @@ citations, tightLists=false, html, + hybrid, relativeReferences=true, ]{markdown} @@ -91,32 +92,35 @@ relativeReferences=true, \markdownSetup{ renderers = { jekyllDataTypographicString = { - \keys_set:nn { Markdown/Template/jekyllData } { {#1} = {#2} } + \keys_set:nn { Markdown/Template/jekyllData } { {#1} = {#2} } }, jekyllDataProgrammaticString = {}, jekyllDataNumber = { - \keys_set:nn { Markdown/Template/jekyllData } { {#1} = {#2} } + \keys_set:nn { Markdown/Template/jekyllData } { {#1} = {#2} } }, jekyllDataBoolean = { - \keys_set:nn { Markdown/Template/jekyllData } { {#1} = {#2} } + \keys_set:nn { Markdown/Template/jekyllData } { {#1} = {#2} } }, jekyllDataEmpty = { - \keys_set:nn { Markdown/Template/jekyllData } { {#1} = {} } + \keys_set:nn { Markdown/Template/jekyllData } { {#1} = {} } }, jekyllDataSequenceBegin = { - \begingroup - \renewcommand*{\markdownRendererJekyllDataTypographicString}[2]{ - \seq_if_exist:cF { g__ptxcd_##1_seq } { - \seq_new:c { g__ptxcd_##1_seq } - } - \seq_gput_right:cn { g__ptxcd_##1_seq } { ##2 } - } - \renewcommand*{\markdownRendererJekyllDataProgrammaticString}[2]{} - }, + \begingroup + + \seq_if_exist:cTF { g__ptxcd_#1_seq } + { \seq_gclear:c { g__ptxcd_#1_seq } } + { \seq_new:c { g__ptxcd_#1_seq } } + + \renewcommand*{\markdownRendererJekyllDataTypographicString}[2]{ + \seq_gput_right:cn { g__ptxcd_#1_seq } { ##2 } + } + + \renewcommand*{\markdownRendererJekyllDataProgrammaticString}[2]{} + }, jekyllDataSequenceEnd = { - \endgroup - }, - backslash = {\\}, + \endgroup + }%, + % backslash = {\\}, } } @@ -164,6 +168,11 @@ relativeReferences=true, \markdownInputPlainTeX{\MarkDownInputFile}% \UseHook{markdownInput/end}% +\markdownSetup{rendererPrototypes={ + backslash = {\\}, +}} + + \AddToHook{markdownInput/end}{\TemplateEnd} \AddToHook{markdownInput/begin}{\TemplateBegin} diff --git a/papers/tex/template-rosenpass.tex b/papers/tex/template-rosenpass.tex index 30178927..b9294aae 100644 --- a/papers/tex/template-rosenpass.tex +++ b/papers/tex/template-rosenpass.tex @@ -30,7 +30,7 @@ } -\usepackage{minted} +\usepackage{minted2} \setminted{bgcolor=rosenpass-gray!20,breaklines} diff --git a/pkgs/whitepaper.nix b/pkgs/whitepaper.nix index 228e389e..3e662b2e 100644 --- a/pkgs/whitepaper.nix +++ b/pkgs/whitepaper.nix @@ -23,11 +23,13 @@ let eso-pic fancyvrb fontspec + framed gitinfo2 gobble ifmtarg koma-script latexmk + lineno lm lualatex-math lua-ul @@ -44,6 +46,7 @@ let upquote xifthen xkeyval + xstring xurl dirtytalk ;