diff options
author | Norbert Preining <norbert@preining.info> | 2022-11-14 03:04:08 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2022-11-14 03:04:08 +0000 |
commit | 1638c7bf59f91caa61849a5c5d73be504d07a49a (patch) | |
tree | 1000754f2cc885bb216b9b4173cb101c13159785 /macros/latex/contrib/ragged2e/ragged2e.dtx | |
parent | 1b59c3c45170420996d629b296e2214933ee1add (diff) |
CTAN sync 202211140304
Diffstat (limited to 'macros/latex/contrib/ragged2e/ragged2e.dtx')
-rw-r--r-- | macros/latex/contrib/ragged2e/ragged2e.dtx | 43 |
1 files changed, 31 insertions, 12 deletions
diff --git a/macros/latex/contrib/ragged2e/ragged2e.dtx b/macros/latex/contrib/ragged2e/ragged2e.dtx index 397b810b40..ecc4ff40a3 100644 --- a/macros/latex/contrib/ragged2e/ragged2e.dtx +++ b/macros/latex/contrib/ragged2e/ragged2e.dtx @@ -2,7 +2,7 @@ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% % % Copyright (C) Martin Schröder, 1996–2019 -% Marei Peischl (peiTeX) <marei@peitex.de>, 2021 +% Marei Peischl (peiTeX) <marei@peitex.de>, 2021–2022 % % This work may be distributed and/or modified under the % conditions of the LaTeX Project Public License, either version 1.3c @@ -29,9 +29,9 @@ % % \fi % \iffalse -\NeedsTeXFormat{LaTeX2e}[2017/03/29] +\NeedsTeXFormat{LaTeX2e}[2021/06/01] %<package>\ProvidesPackage{ragged2e} -%<package> [2021/12/15 v3.1 ragged2e Package] +%<package> [2022/11/13 v3.2 ragged2e Package] % %<*driver> \documentclass[a4paper]{ltxdoc} @@ -42,10 +42,10 @@ \usepackage{array} \usepackage{tabularx} \usepackage{gitinfo2} -\usepackage{hypdoc} \usepackage{geometry} \usepackage{booktabs} \usepackage[document]{ragged2e} +\usepackage{hyperref} \setlength{\RaggedRightRightskip}{0pt plus 4em}% \GetFileInfo{ragged2e.sty} \EnableCrossrefs @@ -76,7 +76,7 @@ \end{document} %</driver> % \fi -% \CheckSum{486} +% \CheckSum{490} % %% \CharacterTable %% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z @@ -591,6 +591,8 @@ % features.\newline % Jordan Firth (\url{jafirth@ncsu.edu}) provided the final push for % version~2.2. +% Maurice Hansen reported and helped testing the fix for the bug adding +% an additional parskip fixed in version 3.2. % % ^^A ----------------------------- % @@ -1141,7 +1143,21 @@ \let\@raggedtwoe@saved@gnewline\@gnewline % \end{macrocode} % \end{macro} -% +% \begin{macro}{\@raggedtwoe@centercrNoindent} +% \changes{v3.2}{2022/11/13}{New macro} +% With the bugfix in version 3.2 we also take care of the indent which +% might be set when ragged2e's newline definition or \cs{@centercr} are +% triggered. This can be easily archieved using the ltpara hooks. +% This is not a final solution for this because on the long run one +% has to replace the paragraph break within \cs{@centercr} to match +% the content structure for tagging. +% \begin{macrocode} +\def\@raggedtwoe@centercrNoindent{% + \AddToHookNext{para/begin}{\OmitIndent}% + \@centercr% +} +% \end{macrocode} +% \end{macro} % \begin{macro}{\@raggedtwoe@gnewline} % The following definition of a \cs{@gnewline} used by the ragged % commands was suggested by Markus Kohm: @@ -1157,11 +1173,14 @@ \unskip \ifmmode % \end{macrocode} -% In formulas we use the original code of \cs{@gnewline}. +% In formulas we adjusted the original code of \cs{g@newline} to a negative fill to match the alignment of text. +% Outside those we use \cs{@centercr} to remove the added parskip. +% \changes{v3.2}{2022/11/13}{Fix bug adding parskip with newline} % \begin{macrocode} - \reserved@e {\reserved@f #1}\nobreak \hfil \break + \reserved@e {\reserved@f #1}\nobreak \hskip\z@ \break \else - \reserved@e {\reserved@f #1}{\parskip\z@\par}% + \reserved@e {\reserved@f #1}% + \@raggedtwoe@centercrNoindent \fi \fi } @@ -1189,7 +1208,7 @@ % \begin{macrocode} \DeclareRobustCommand{\Centering}{% \ifx\\\@raggedtwoe@savedcr - \let\\\@centercr + \let\\\@raggedtwoe@centercrNoindent \fi \let\@gnewline\@raggedtwoe@gnewline \leftskip\CenteringLeftskip @@ -1212,7 +1231,7 @@ % \begin{macrocode} \DeclareRobustCommand{\RaggedLeft}{% \ifx\\\@raggedtwoe@savedcr - \let\\\@centercr + \let\\\@raggedtwoe@centercrNoindent \fi \let\@gnewline\@raggedtwoe@gnewline \leftskip\RaggedLeftLeftskip @@ -1235,7 +1254,7 @@ % \begin{macrocode} \DeclareRobustCommand{\RaggedRight}{% \ifx\\\@raggedtwoe@savedcr - \let\\\@centercr + \let\\\@raggedtwoe@centercrNoindent \fi \let\@gnewline\@raggedtwoe@gnewline \leftskip\RaggedRightLeftskip |