summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2023-02-25 22:05:23 +0000
committerKarl Berry <karl@freefriends.org>2023-02-25 22:05:23 +0000
commit790c83eb85b753689170ef925320ab855435b580 (patch)
tree134fec86127e7562430de396ab333b530d7c0e00
parente7df7311c6a26469dff38edbf3ddc6fe5357716e (diff)
ragged2e (25feb23)
git-svn-id: svn://tug.org/texlive/trunk@66152 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/ragged2e/README.md3
-rw-r--r--Master/texmf-dist/doc/latex/ragged2e/ragged2e.pdfbin699245 -> 700154 bytes
-rw-r--r--Master/texmf-dist/source/latex/ragged2e/ragged2e.dtx64
-rw-r--r--Master/texmf-dist/tex/latex/ragged2e/ragged2e.sty36
4 files changed, 56 insertions, 47 deletions
diff --git a/Master/texmf-dist/doc/latex/ragged2e/README.md b/Master/texmf-dist/doc/latex/ragged2e/README.md
index 0c8ecc48658..c60c60c5314 100644
--- a/Master/texmf-dist/doc/latex/ragged2e/README.md
+++ b/Master/texmf-dist/doc/latex/ragged2e/README.md
@@ -2,7 +2,7 @@
Copyright (C) Martin Schröder, 1996–2019, Marei Peischl (peiTeX) <marei@peitex.de>, 2021–2023
- ragged2e 2023/02/22 v3.3
+ ragged2e 2023/02/25 v3.4
***************************************************************************
@@ -41,5 +41,6 @@ or want to report a suggestion for improvement, please visit
* 3.1 Robustify the user macros (Thanks for Markus Kohm for the hint)
* 3.2 Fix bug adding a parskip when using `\newline` within the raggged2e alignments (Thanks to Maurice Hansen for reporting)
* 3.3 Only modify the alignment when one of the ragged2e commands is active
+ * 3.4 Bugfix: Remove spurious spaces (Thanks to Enrico Gregorio for reporting)
diff --git a/Master/texmf-dist/doc/latex/ragged2e/ragged2e.pdf b/Master/texmf-dist/doc/latex/ragged2e/ragged2e.pdf
index 042265ba49d..b104f464d35 100644
--- a/Master/texmf-dist/doc/latex/ragged2e/ragged2e.pdf
+++ b/Master/texmf-dist/doc/latex/ragged2e/ragged2e.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/ragged2e/ragged2e.dtx b/Master/texmf-dist/source/latex/ragged2e/ragged2e.dtx
index 817f1d66760..6ca9b7fc3d8 100644
--- a/Master/texmf-dist/source/latex/ragged2e/ragged2e.dtx
+++ b/Master/texmf-dist/source/latex/ragged2e/ragged2e.dtx
@@ -2,7 +2,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% Copyright (C) Martin Schröder, 1996–2019
-% Marei Peischl (peiTeX) <marei@peitex.de>, 2021–2023
+% Marei Peischl (peiTeX) <marei@peitex.de>, 2021–2023
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -31,7 +31,7 @@
% \iffalse
\NeedsTeXFormat{LaTeX2e}[2021/06/01]
%<package>\ProvidesPackage{ragged2e}
-%<package> [2023/02/22 v3.3 ragged2e Package]
+%<package> [2023/02/25 v3.4 ragged2e Package]
%
%<*driver>
\documentclass[a4paper]{ltxdoc}
@@ -43,7 +43,7 @@
\usepackage{tabularx}
\makeatletter
\IfFileExists{gitHeadInfo.gin}{
- \newcommand*{\GI@githeadinfo@file}{gitHeadInfo.gin}
+ \newcommand*{\GI@githeadinfo@file}{gitHeadInfo.gin}
}{}
\makeatother
\usepackage{gitinfo2}
@@ -218,13 +218,13 @@
% \begin{macrocode}
%<*latex>
\DeclareRobustCommand
- \raggedright{%
- \let\\\@centercr
- \@rightskip\@flushglue
- \rightskip\@rightskip
- \finalhyphendemerits=\z@
- \leftskip\z@skip
- \parindent\z@}
+ \raggedright{%
+ \let\\\@centercr
+ \@rightskip\@flushglue
+ \rightskip\@rightskip
+ \finalhyphendemerits=\z@
+ \leftskip\z@skip
+ \parindent\z@}
% \end{macrocode}
% Initially, \cs{@flushglue} is defined as
% \begin{macrocode}
@@ -558,7 +558,7 @@
% \item[\normalfont\package{everysel}\,\cite{everysel}](only if format older than 2021/01/05)
% It has been used to distinguish between monospaced and proportional
% fonts as long as the LaTeX kernel did not provide the functionality with lthooks \cite{lthooks-doc}.
-% Formats newer than 2021/01/05 do no longer depend on everysel.
+% Formats newer than 2021/01/05 do no longer depend on everysel.
% \item[\normalfont\package{footmisc}\,\cite{footmisc}]
% It is used by the \option{footnotes} and the
% \option{document} options; at least version~5.00 (2002/08/28)
@@ -1124,8 +1124,8 @@
% \begin{macrocode}
\newif\if@raggedtwoe@localhook
\IfFormatAtLeastTF{2021/01/05}
- {\@raggedtwoe@localhooktrue}
- {\EverySelectfont{\@raggedtwoe@everyselectfont}}
+ {\@raggedtwoe@localhooktrue}
+ {\EverySelectfont{\@raggedtwoe@everyselectfont}}
% \end{macrocode}
% We define a command to only add the local hook with the ragged2e commands.
% This will keep the impact local.
@@ -1165,8 +1165,8 @@
% the content structure for tagging.
% \begin{macrocode}
\def\@raggedtwoe@centercrNoindent{%
- \AddToHookNext{para/begin}{\OmitIndent}%
- \@centercr%
+ \AddToHookNext{para/begin}{\OmitIndent}%
+ \@centercr%
}
% \end{macrocode}
% \end{macro}
@@ -1192,7 +1192,7 @@
\reserved@e {\reserved@f #1}\nobreak \hskip\z@ \break
\else
\reserved@e {\reserved@f #1}%
- \@raggedtwoe@centercrNoindent
+ \@raggedtwoe@centercrNoindent
\fi
\fi
}
@@ -1214,14 +1214,16 @@
% \end{Quote}
% Finally we signal the code inserted into \cs{selectfont} that
% we are active and call that code directly.
+% \changes{v3.4}{2023/02/25}{Bugfix: remove spurious space}
+% \changes{v3.3}{2023/02/22}{Apply hook only when a ragged2e command is active}
% \changes{v3.1}{2021/12/15}{Robustify the user macros (Thanks to Markus Kohm for the hint)}
% \changes{v2.00}{2003/01/04}{Call \cs{@raggedtwoe@everyselectfont}
% and switch \cs{@gnewline}}
% \begin{macrocode}
\DeclareRobustCommand{\Centering}{%
- \if@raggedtwoe@localhook
- \AddToHook{selectfont}[ragged2e]{\@raggedtwoe@everyselectfont}
- \fi
+ \if@raggedtwoe@localhook
+ \AddToHook{selectfont}[ragged2e]{\@raggedtwoe@everyselectfont}%
+ \fi
\ifx\\\@raggedtwoe@savedcr
\let\\\@raggedtwoe@centercrNoindent
\fi
@@ -1240,14 +1242,16 @@
% \begin{macro}{\RaggedLeft}
% \cs{RaggedLeft} is like \cs{Centering}; it only uses other
% parameters.
+% \changes{v3.4}{2023/02/25}{Bugfix: remove spurious space}
+% \changes{v3.3}{2023/02/22}{Apply hook only when a ragged2e command is active.}
% \changes{v3.1}{2021/12/15}{Robustify the user macros}
% \changes{v2.00}{2003/01/04}{Call \cs{@raggedtwoe@everyselectfont}
% and switch \cs{@gnewline}}
% \begin{macrocode}
\DeclareRobustCommand{\RaggedLeft}{%
- \if@raggedtwoe@localhook
- \AddToHook{selectfont}[ragged2e]{\@raggedtwoe@everyselectfont}
- \fi
+ \if@raggedtwoe@localhook
+ \AddToHook{selectfont}[ragged2e]{\@raggedtwoe@everyselectfont}%
+ \fi
\ifx\\\@raggedtwoe@savedcr
\let\\\@raggedtwoe@centercrNoindent
\fi
@@ -1266,14 +1270,16 @@
% \begin{macro}{\RaggedRight}
% \cs{RaggedRight} is like \cs{Centering}; it only uses other
% parameters.
+% \changes{v3.4}{2023/02/25}{Bugfix: remove spurious space}
+% \changes{v3.3}{2023/02/22}{Apply hook only when a ragged2e command is active.}
% \changes{v3.1}{2021/12/15}{Robustify the user macros (Thanks to Markus Kohm for the hint)}
% \changes{v2.00}{2003/01/04}{Call \cs{@raggedtwoe@everyselectfont}
% and switch \cs{@gnewline}}
% \begin{macrocode}
\DeclareRobustCommand{\RaggedRight}{%
- \if@raggedtwoe@localhook
- \AddToHook{selectfont}[ragged2e]{\@raggedtwoe@everyselectfont}
- \fi
+ \if@raggedtwoe@localhook
+ \AddToHook{selectfont}[ragged2e]{\@raggedtwoe@everyselectfont}%
+ \fi
\ifx\\\@raggedtwoe@savedcr
\let\\\@raggedtwoe@centercrNoindent
\fi
@@ -1292,13 +1298,15 @@
% \begin{macro}{\justifying}
% \cs{justifying} switches back to the defaults used by \LaTeX{} for
% typesetting justyfied text.
+% \changes{v3.4}{2023/02/25}{Bugfix: remove spurious space}
+% \changes{v3.3}{2023/02/22}{Apply hook only when a ragged2e command is active.}
% \changes{v3.1}{2021/12/15}{Robustify the user macros (Thanks to Markus Kohm for the hint)}
% \changes{v2.00}{2003/01/04}{New macro}
% \begin{macrocode}
\DeclareRobustCommand{\justifying}{%
- \if@raggedtwoe@localhook
- \AddToHook{selectfont}[ragged2e]{\@raggedtwoe@everyselectfont}
- \fi
+ \if@raggedtwoe@localhook
+ \AddToHook{selectfont}[ragged2e]{\@raggedtwoe@everyselectfont}%
+ \fi
\let\\\@raggedtwoe@savedcr
\let\@gnewline\@raggedtwoe@saved@gnewline
\leftskip\z@
diff --git a/Master/texmf-dist/tex/latex/ragged2e/ragged2e.sty b/Master/texmf-dist/tex/latex/ragged2e/ragged2e.sty
index da01c42254b..88ea8d79186 100644
--- a/Master/texmf-dist/tex/latex/ragged2e/ragged2e.sty
+++ b/Master/texmf-dist/tex/latex/ragged2e/ragged2e.sty
@@ -28,7 +28,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}[2021/06/01]
\ProvidesPackage{ragged2e}
- [2023/02/22 v3.3 ragged2e Package]
+ [2023/02/25 v3.4 ragged2e Package]
%% \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
%% Lower-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
@@ -180,14 +180,14 @@
}
\newif\if@raggedtwoe@localhook
\IfFormatAtLeastTF{2021/01/05}
-{\@raggedtwoe@localhooktrue}
-{\EverySelectfont{\@raggedtwoe@everyselectfont}}
+ {\@raggedtwoe@localhooktrue}
+ {\EverySelectfont{\@raggedtwoe@everyselectfont}}
\newcommand*{\@raggedtwoe@addlocalhook}{}
\let\@raggedtwoe@savedcr\\
\let\@raggedtwoe@saved@gnewline\@gnewline
\def\@raggedtwoe@centercrNoindent{%
-\AddToHookNext{para/begin}{\OmitIndent}%
-\@centercr%
+ \AddToHookNext{para/begin}{\OmitIndent}%
+ \@centercr%
}
\newcommand*{\@raggedtwoe@gnewline}[1]{%
\ifvmode
@@ -198,14 +198,14 @@
\reserved@e {\reserved@f #1}\nobreak \hskip\z@ \break
\else
\reserved@e {\reserved@f #1}%
-\@raggedtwoe@centercrNoindent
+ \@raggedtwoe@centercrNoindent
\fi
\fi
}
\DeclareRobustCommand{\Centering}{%
-\if@raggedtwoe@localhook
-\AddToHook{selectfont}[ragged2e]{\@raggedtwoe@everyselectfont}
-\fi
+ \if@raggedtwoe@localhook
+ \AddToHook{selectfont}[ragged2e]{\@raggedtwoe@everyselectfont}%
+ \fi
\ifx\\\@raggedtwoe@savedcr
\let\\\@raggedtwoe@centercrNoindent
\fi
@@ -219,9 +219,9 @@
\@raggedtwoe@everyselectfont
}
\DeclareRobustCommand{\RaggedLeft}{%
-\if@raggedtwoe@localhook
-\AddToHook{selectfont}[ragged2e]{\@raggedtwoe@everyselectfont}
-\fi
+ \if@raggedtwoe@localhook
+ \AddToHook{selectfont}[ragged2e]{\@raggedtwoe@everyselectfont}%
+ \fi
\ifx\\\@raggedtwoe@savedcr
\let\\\@raggedtwoe@centercrNoindent
\fi
@@ -235,9 +235,9 @@
\@raggedtwoe@everyselectfont
}
\DeclareRobustCommand{\RaggedRight}{%
-\if@raggedtwoe@localhook
-\AddToHook{selectfont}[ragged2e]{\@raggedtwoe@everyselectfont}
-\fi
+ \if@raggedtwoe@localhook
+ \AddToHook{selectfont}[ragged2e]{\@raggedtwoe@everyselectfont}%
+ \fi
\ifx\\\@raggedtwoe@savedcr
\let\\\@raggedtwoe@centercrNoindent
\fi
@@ -251,9 +251,9 @@
\@raggedtwoe@everyselectfont
}
\DeclareRobustCommand{\justifying}{%
-\if@raggedtwoe@localhook
-\AddToHook{selectfont}[ragged2e]{\@raggedtwoe@everyselectfont}
-\fi
+ \if@raggedtwoe@localhook
+ \AddToHook{selectfont}[ragged2e]{\@raggedtwoe@everyselectfont}%
+ \fi
\let\\\@raggedtwoe@savedcr
\let\@gnewline\@raggedtwoe@saved@gnewline
\leftskip\z@