From 2ffcb33d6db43a36c788d5d7518da3d721982311 Mon Sep 17 00:00:00 2001 From: Malin Freeborn <malinfreeborn@posteo.net> Date: Sun, 21 Jan 2024 23:24:17 +0100 Subject: [PATCH] replace \noafterpar with \NoIndentAfter --- layout.sty | 35 +++++++++++++++++++---------------- stats.sty | 2 -- 2 files changed, 19 insertions(+), 18 deletions(-) diff --git a/layout.sty b/layout.sty index 6b7c9ee7..0b52423b 100644 --- a/layout.sty +++ b/layout.sty @@ -584,9 +584,8 @@ interior code={ \path[tcb fill interior] ([xshift=-2mm]interior.west) colback=white, before={\vspace{.5em}\noindent}, fonttitle={\scshape #1}, - before upper={\parindent15pt\afterparnoindent}, + before upper={\parindent15pt\noindent}, after upper={\iftoggle{verbose}{}{\par What do you do?}}, - after={\afterparnoindent}, } \newcommand{\sidebox}[2][23]{ @@ -946,17 +945,6 @@ interior code={ \path[tcb fill interior] ([xshift=-2mm]interior.west) \raggedbottom - \newif\ifafterpar - \newcommand\afterparnoindent{% - \global\afterpartrue - \global\everypar{% - \ifafterpar - \global\afterparfalse - {\setbox\z@\lastbox}% - \else - \everypar{}% - \fi}} - % Make floats hug the text. \setlength\intextsep{0em} @@ -975,9 +963,25 @@ interior code={ \path[tcb fill interior] ([xshift=-2mm]interior.west) \begin{quotation}}% { \end{quotation} - \afterparnoindent } +\newcommand*\@NoIndentAfter{% + \@ifnextchar\par{% + \def\par{% + \everypar{\setbox\z@\lastbox\everypar{}}% + \@restorepar% + }% + }{}% +} +\newrobustcmd*{\NoIndentAfterThis}{\@NoIndentAfter\par\par} + +\AfterEndEnvironment{speechtext}{\NoIndentAfterThis} +\AfterEndEnvironment{boxtext}{\NoIndentAfterThis} +\AfterEndEnvironment{nametable}{\NoIndentAfterThis} +\AfterEndEnvironment{exampletext}{\NoIndentAfterThis} +\AfterEndEnvironment{boxtable}{\NoIndentAfterThis} +\AfterEndEnvironment{tcolorbox}{\NoIndentAfterThis} + \newenvironment{exampletext} { \parindent2em% @@ -988,7 +992,6 @@ interior code={ \path[tcb fill interior] ([xshift=-2mm]interior.west) {% \par \nobreak\bigLine\par - \afterparnoindent% } \newcommand\sideBySide[2]{ @@ -1046,7 +1049,7 @@ interior code={ \path[tcb fill interior] ([xshift=-2mm]interior.west) { \hline \endtabularx - \vspace{1em} + \vspace{.5em} } \newtcolorbox{wideTable}[2][cX]{ diff --git a/stats.sty b/stats.sty index 3efad4dd..b80091ec 100644 --- a/stats.sty +++ b/stats.sty @@ -509,7 +509,6 @@ \renewcommand\abilities{} \global\togglefalse{perfectArmour} \renewcommand\npcQuote{} - \afterparnoindent } \newcommand{\animal}[9]{ @@ -585,7 +584,6 @@ \renewcommand\abilities{} \global\togglefalse{perfectArmour} \setcounter{wounds}{0} - \afterparnoindent } \newcommand{\clean}{ -- GitLab