diff options
author | Karl Berry <karl@freefriends.org> | 2021-02-06 22:28:55 +0000 |
---|---|---|
committer | Karl Berry <karl@freefriends.org> | 2021-02-06 22:28:55 +0000 |
commit | 1a26369eaf03943c7c533a207e4dea7922cd3336 (patch) | |
tree | 18ae9b7819ba17ddab9c726dd19cf317e091b5cd /Master/texmf-dist/source/latex | |
parent | 49611871cee1ff301a0c538a891efacdd8b4d98e (diff) |
ragged2e (6feb21)
git-svn-id: svn://tug.org/texlive/trunk@57638 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r-- | Master/texmf-dist/source/latex/ragged2e/Makefile | 31 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/ragged2e/ragged2e.drv | 117 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/ragged2e/ragged2e.dtx | 174 | ||||
-rw-r--r-- | Master/texmf-dist/source/latex/ragged2e/ragged2e.ins | 86 |
4 files changed, 82 insertions, 326 deletions
diff --git a/Master/texmf-dist/source/latex/ragged2e/Makefile b/Master/texmf-dist/source/latex/ragged2e/Makefile deleted file mode 100644 index fe07f4f1f67..00000000000 --- a/Master/texmf-dist/source/latex/ragged2e/Makefile +++ /dev/null @@ -1,31 +0,0 @@ -doc: ragged2e.pdf ragged2e.dvi -ragged2e.dvi: ragged2e.pdf - latex ragged2e.drv - -ragged2e.pdf: ragged2e.dtx ragged2e.drv ragged2e.sty - pdflatex -draftmode ragged2e.drv - pdflatex -draftmode ragged2e.drv - makeindex -s gind.ist -t ragged2e.ind.ilg ragged2e ragged2e.idx - makeindex -s gglo.ist -t ragged2e.gls.ilg -o ragged2e.gls ragged2e ragged2e.glo - pdflatex ragged2e.drv - -ragged2e.drv ragged2e.sty: ragged2e.dtx ragged2e.ins - latex ragged2e.ins - -ragged2e.zip: ragged2e.dtx ragged2e.pdf ragged2e.ins - $(eval RELEASEDIR := $(shell mktemp -d)) - @cp -a ragged2e.dtx ragged2e.pdf ragged2e.ins $(RELEASEDIR) - @cp .git/gitHeadInfo.gin $(RELEASEDIR)/gitHeadLocal.gin - @sed -i 's/usepackage{gitinfo2}/usepackage[release]{gitinfo2}/g' $(RELEASEDIR)/ragged2e.dtx - @zip --junk-paths ragged2e.zip $(RELEASEDIR)/ragged2e.dtx $(RELEASEDIR)/ragged2e.pdf $(RELEASEDIR)/ragged2e.ins $(RELEASEDIR)/gitHeadLocal.gin - @rm -rf $(RELEASEDIR) - -.PHONY: clean clobber - -clean: - rm -f *.aux *.toc *.glo *.gls *.hd *.idx *.ilg *.ind *.log - -clobber: clean - rm -f *.dvi *.pdf *.sty *.drv *.zip - -# vim:noexpandtab diff --git a/Master/texmf-dist/source/latex/ragged2e/ragged2e.drv b/Master/texmf-dist/source/latex/ragged2e/ragged2e.drv deleted file mode 100644 index e877d11cb61..00000000000 --- a/Master/texmf-dist/source/latex/ragged2e/ragged2e.drv +++ /dev/null @@ -1,117 +0,0 @@ -%% -%% This is file `ragged2e.drv', -%% generated with the docstrip utility. -%% -%% The original source files were: -%% -%% ragged2e.dtx (with options: `driver') -%% -%% Copyright 1996..2019 Martin Schroeder. -%% -%% This file is part of the Ragged2e package -%% ----------------------------------------- -%% -%% To produce the documentation in the way you like you are allowed -%% to change this driver file. -%% -\NeedsTeXFormat{LaTeX2e}[2017/03/29] -\ProvidesFile{ragged2e.drv} - [2019/03/26 v1.09 Driver for ragged2e Package (MS)] -\documentclass[a4paper]{ltxdoc} -\usepackage[T1]{fontenc} -\usepackage{lmodern} -\usepackage{microtype} -\usepackage{url} % in latex/contrib/other/misc -\usepackage{array} -\usepackage{tabularx} -\usepackage{gitinfo2} -\usepackage{hypdoc} -\usepackage{geometry} -\IfFileExists{booktabs.sty}{% - \usepackage{booktabs}% - }{% - \PackageWarning{ragged2e}% - {booktabs.sty is missing.\MessageBreak - I'm emulating the needed commands, but you should\MessageBreak - install it for better results}% - \let\toprule\hline - \let\midrule\hline - \let\bottomrule\hline - } -\IfFileExists{footmisc.sty}{% - \usepackage[document]{ragged2e}[2003/01/26] - }{% - \PackageWarning{ragged2e}% - {footmisc.sty is missing.\MessageBreak - You should install it for better results}% - \usepackage[raggedrightboxes]{ragged2e}[2003/01/26] - } -\setlength{\RaggedRightRightskip}{0pt plus 4em}% -\GetFileInfo{ragged2e.sty} -\EnableCrossrefs -\RecordChanges % Gather update information -%%\DisableCrossrefs% Say \DisableCrossrefs if index is ready -\CodelineIndex % Index code by line number -%%\OldMakeIndex % use if your MakeIndex is pre-v2.9 -\setcounter{IndexColumns}{2} -\makeatletter - \renewenvironment{theglossary}{% - \glossary@prologue - \setlength\emergencystretch{5em} - \GlossaryParms \let\item\@idxitem \ignorespaces}{} - \makeatother -\setlength{\IndexMin}{40ex} -\setlength{\columnseprule}{.4pt} -\addtolength{\oddsidemargin}{3cm} -\addtolength{\textwidth}{-3cm} -\begin{document} - \DocInput{ragged2e.dtx} - \PrintIndex\PrintChanges - % Make sure that the index is not printed twice - % (ltxdoc.cfg might have a second \PrintIndex command) - \let\PrintChanges\relax - \let\PrintIndex\relax -\end{document} -%% Copyright 1996..2019 by Martin Schr\"oder. -%% \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 -%% Digits \0\1\2\3\4\5\6\7\8\9 -%% Exclamation \! Double quote \" Hash (number) \# -%% Dollar \$ Percent \% Ampersand \& -%% Acute accent \' Left paren \( Right paren \) -%% Asterisk \* Plus \+ Comma \, -%% Minus \- Point \. Solidus \/ -%% Colon \: Semicolon \; Less than \< -%% Equals \= Greater than \> Question mark \? -%% Commercial at \@ Left bracket \[ Backslash \\ -%% Right bracket \] Circumflex \^ Underscore \_ -%% Grave accent \` Left brace \{ Vertical bar \| -%% Right brace \} Tilde \~} -%% -%% \iffalse meta-comment -%% =================================================================== -%% @LaTeX-style-file{ -%% author = {Martin Schr\"oder}, -%% version = "2.2", -%% date = "26 Mar 2019", -%% filename = "ragged2e.sty", -%% address = {Martin Schr\"oder -%% Unterstra\"se 31 -%% 47051 Duisburg -%% Germany} -%% email = "martin@oneiros.de", -%% docstring = "LaTeX package which defines new commands -%% \Centering, \RaggedLeft, \RaggedRight and -%% \justifying and new environments Center, -%% FlushLeft, FlushRight and justify, which -%% set ragged text and are easily configurable -%% to allow hyphenation. -%% Uses the everysel package. -%% " -%% } -%% =================================================================== -%% \fi -\endinput -%% -%% End of file `ragged2e.drv'. diff --git a/Master/texmf-dist/source/latex/ragged2e/ragged2e.dtx b/Master/texmf-dist/source/latex/ragged2e/ragged2e.dtx index dd30514ccbc..5c3408cf12f 100644 --- a/Master/texmf-dist/source/latex/ragged2e/ragged2e.dtx +++ b/Master/texmf-dist/source/latex/ragged2e/ragged2e.dtx @@ -1,41 +1,51 @@ +%% \iffalse meta-comment +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% Copyright (C) Martin Schröder, 1996–2019 +% Marei Peischl (peiTeX) <marei@peitex.de>, 2021 +% +% This work may be distributed and/or modified under the +% conditions of the LaTeX Project Public License, either version 1.3c +% of this license or (at your option) any later version. +% The latest version of this license is in +% http://www.latex-project.org/lppl.txt +% and version 1.3c or later is part of all distributions of LaTeX +% version 2005/12/01 or later. +% +% This work has the LPPL maintenance status `maintained'. +% +% The Current Maintainer of this work is +% Marei Peischl <marei@peitex.de>. +% +% +% This work consists of the files +% README.md +% ragged2e.dtx +% ragged2e.ins +% and the derived file +% ragged2e.sty. +% +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% \fi % \iffalse \NeedsTeXFormat{LaTeX2e}[2017/03/29] %<package>\ProvidesPackage{ragged2e} -%<package> [2019/07/28 v2.2 ragged2e Package (MS)] +%<package> [2021/02/05 v3.0 ragged2e Package] % %<*driver> -\ProvidesFile{ragged2e.drv} - [2019/03/26 v1.09 Driver for ragged2e Package (MS)] \documentclass[a4paper]{ltxdoc} \usepackage[T1]{fontenc} \usepackage{lmodern} \usepackage{microtype} -\usepackage{url} % in latex/contrib/other/misc +\usepackage{url} \usepackage{array} \usepackage{tabularx} \usepackage{gitinfo2} \usepackage{hypdoc} \usepackage{geometry} -% booktabs.sty is in latex/contrib/supported/booktab -\IfFileExists{booktabs.sty}{% - \usepackage{booktabs}% - }{% - \PackageWarning{ragged2e}% - {booktabs.sty is missing.\MessageBreak - I'm emulating the needed commands, but you should\MessageBreak - install it for better results}% - \let\toprule\hline - \let\midrule\hline - \let\bottomrule\hline - } -\IfFileExists{footmisc.sty}{% - \usepackage[document]{ragged2e}[2003/01/26] - }{% - \PackageWarning{ragged2e}% - {footmisc.sty is missing.\MessageBreak - You should install it for better results}% - \usepackage[raggedrightboxes]{ragged2e}[2003/01/26] - } +\usepackage{booktabs} +\usepackage[document]{ragged2e} \setlength{\RaggedRightRightskip}{0pt plus 4em}% \GetFileInfo{ragged2e.sty} \EnableCrossrefs @@ -65,25 +75,8 @@ \let\PrintIndex\relax \end{document} %</driver> -% -%% Copyright 1996..2019 by Martin Schr\"oder. -% -% This work may be distributed and/or modified under the -% conditions of the LaTeX Project Public License, either version 1.3 -% of this license or (at your option) any later version. -% The latest version of this license is in -% http://www.latex-project.org/lppl.txt -% and version 1.3 or later is part of all distributions of LaTeX -% version 2005/12/01 or later. -% -% This work has the LPPL maintenance status `unmaintained'. -% -% This work consists of the files ragged2e.dtx and ragged2e.ins -% and the derived file ragged2e.sty. -% % \fi -% -% \CheckSum{478} +% \CheckSum{486} % %% \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 @@ -101,34 +94,6 @@ %% Grave accent \` Left brace \{ Vertical bar \| %% Right brace \} Tilde \~} %% -%% \iffalse meta-comment -%% =================================================================== -%% @LaTeX-style-file{ -%% author = {Martin Schr\"oder}, -%% version = "2.2", -%% date = "26 Mar 2019", -%% filename = "ragged2e.sty", -%% address = {Martin Schr\"oder -%% Unterstra\"se 31 -%% 47051 Duisburg -%% Germany} -%% email = "martin@oneiros.de", -% codetable = "ISO/ASCII", -% keywords = "raggedright", -% dependences = "everysel", -% supported = "yes", -%% docstring = "LaTeX package which defines new commands -%% \Centering, \RaggedLeft, \RaggedRight and -%% \justifying and new environments Center, -%% FlushLeft, FlushRight and justify, which -%% set ragged text and are easily configurable -%% to allow hyphenation. -%% Uses the everysel package. -%% " -%% } -%% =================================================================== -%% \fi -% % \pagestyle{headings} % % \newcommand*{\file}[1] {\texttt{#1}} @@ -172,12 +137,7 @@ % The version number of this file is \fileversion, % revision~\#\gitAbbrevHash, last revised \protect\gitAuthorIsoDate.}^^A % } -% \author{Martin Schr\"oder\\[0.5ex] -% \normalsize Unterstra\ss{}e 31\\ -% \normalsize 47051 Duisburg\\ -% \normalsize Germany\\ -% \normalsize \texttt{martin@oneiros.de}\\ -% \normalsize \url{https://gitlab.com/hagenbuch/ragged2e}} +% \author{Martin Schröder\\\url{https://gitlab.com/TeXhackse/ragged2e}\thanks{maintained by Marei Peischl}} % \date{\filedate} % \maketitle % @@ -203,19 +163,8 @@ % \setlength{\parskip}{^^A % .3\baselineskip plus.05\baselineskip minus.05\baselineskip} % -% \section{Status of this package} % \changes{v2.2}{2019/07/28}{Change maintenance status of package} -% ^^A -% This package is \emph{unmaintained}. -% -% I will not actively work on this package anymore. I \emph{may} -% merge merge requests to the repository on Gitlab -% (\url{https://gitlab.com/hagenbuch/ragged2e}). If you want to -% become the maintainer of this package, contact me and I may hand -% over the repository to you. Or fork the package on Gitlab. -% -% I will \emph{not} upload new versions to CTAN. -% +% \changes{v3.0}{2021/02/05}{Change maintenance status} % \section{The problem} % ^^A % \LaTeX{} has three commands (\cs{centering}, \cs{raggedleft}, and @@ -595,11 +544,13 @@ % ^^A % \changes{v2.1}{2003/10/08}{document that \option{document} needs % \package{footmisc}} +% \changes{v3.0}{2021/02/05}{document everysel is obsolete} % This package requires the following packages: % \begin{description} -% \item[\normalfont\package{everysel}\,\cite{everysel}] -% It is used to distinguish between monospaced and proportional -% fonts. +% \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. % \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) @@ -632,7 +583,7 @@ % \cs{@gnewline}.\newline % Frank Mittelbach (\url{frank.mittelbach@latex-project.org}) % provided the impetus for version~2.00.\newline -% Rolf Niepraschk (\url{Rolf.Niepraschk@gmx.de}) and Hubert G\"a\ss{}lein +% Rolf Niepraschk (\url{Rolf.Niepraschk@gmx.de}) and Hubert Gäßlein % found many bugs and provided fixes for them and code for new % features.\newline % Jordan Firth (\url{jafirth@ncsu.edu}) provided the final push for @@ -646,7 +597,7 @@ % % \bibitem{ltmiscen} % Johannes Braams, David Carlisle, Alan Jeffrey, Leslie Lamport, Frank -% Mittelbach, Chris Rowley, and Rainer Sch{\"o}pf. +% Mittelbach, Chris Rowley, and Rainer Schöpf. % \newblock ltmiscen.dtx. % \newblock Part of the {\LaTeX}-distribution. % @@ -654,11 +605,11 @@ % Robin Fairbairns. % \newblock \texttt{footmisc} --- a portmanteau package for % customising footnotes in \LaTeXe. -% \newblock \url{CTAN: tex-archive/macros/latex/contrib/supported/footmisc/footmisc.dtx}. +% \newblock \url{https://mirror.ctan.org/macros/latex/contrib/footmisc/}. % % \bibitem{raggedr} % James Kilfiger. -% \newblock \url{CTAN: tex-archive/macros/latex/contrib/other/misc/raggedr.sty}. +% \newblock \url{https://ctan.org/tex-archive/obsolete/macros/latex/contrib/misc/raggedr.sty}. % \newblock \LaTeXe{} package. % % \bibitem{KnuthTeXa} @@ -671,21 +622,26 @@ % \newblock \emph{\LaTeX: A Document Preparation System}. % \newblock Ad{\-d}i{\-s}on-Wes{\-l}ey, Reading, MA, USA, first edition, 1986. % +% \bibitem{lthooks-doc} +% Frank Mittelbach. +% \newblock The \package{lthooks} package. +% \newblock \url{http://mirrors.ctan.org/macros/latex/base/lthooks-doc.pdf} +% % \bibitem{cmfonts} -% Frank Mittelbach and Rainer Sch{\"o}pf. +% Frank Mittelbach and Rainer Schöpf. % \newblock The file {\texttt{cmfonts.fdd}} for use with {\LaTeXe}. % \newblock Part of the {\LaTeX}-distribution. % % \bibitem{everysel} -% Martin Schr{\"o}der. -% \newblock The \package{everysel}-package. -% \newblock \url{CTAN: tex-archive/macros/latex/contrib/supported/ms/everysel.dtx}. +% Martin Schröder. +% \newblock The obsolete \package{everysel}-package. +% \newblock \url{http://mirrors.ctan.org/macros/latex/contrib/everysel/everysel.pdf}. % \newblock \LaTeXe{} package. % % \bibitem{raggedri} -% Martin Schr{\"o}der. +% Martin Schröder. % \newblock The \package{raggedri} document option. -% \newblock Was in \url{CTAN: tex-archive/macros/latex209/contrib/raggedright}. +% \newblock Was in \url{http://mirrors.ctan.org/tex-archive/macros/latex209/contrib/raggedright}. % \newblock \LaTeX2.09 style, outdated. % % \bibitem{ragged} @@ -959,10 +915,12 @@ % % \subsection{Loading packages} % ^^A -% We need the \package{everysel} package. +% \changes{v3.00}{2021/02/05}{Remove the \package{everysel} package if kernel hooks are available} +% We need the \package{everysel} package for older kernels. % \changes{v2.00}{2003/01/18}{Load the \package{footmisc} package}% % \begin{macrocode} -\RequirePackage{everysel} +\providecommand\IfFormatAtLeastTF{\@ifl@t@r\fmtversion} +\IfFormatAtLeastTF{2021/01/05}{}{\RequirePackage{everysel}} % \end{macrocode} % If the option \option{footnotes} is selected, we load the % \package{footmisc} package after we are finished (\package{footmisc} @@ -1149,7 +1107,13 @@ \spaceskip\z@ \fi } -\EverySelectfont{\@raggedtwoe@everyselectfont} +% \end{macrocode} +% If our kernel is new enough we use the kernel hook directly instead of the everysel macro. +% \changes{v3.00}{2021/02/05}{Use kernel hook if available} +% \begin{macrocode} +\IfFormatAtLeastTF{2021/01/05} + {\AddToHook{selectfont}{\@raggedtwoe@everyselectfont}} + {\EverySelectfont{\@raggedtwoe@everyselectfont}} % \end{macrocode} % \end{macro} % @@ -1394,4 +1358,4 @@ %</package> % \end{macrocode} % \Finale -% ^^A vim:tw=70:ts=2 +% ^^A diff --git a/Master/texmf-dist/source/latex/ragged2e/ragged2e.ins b/Master/texmf-dist/source/latex/ragged2e/ragged2e.ins index 72cc08ee565..e2134b76203 100644 --- a/Master/texmf-dist/source/latex/ragged2e/ragged2e.ins +++ b/Master/texmf-dist/source/latex/ragged2e/ragged2e.ins @@ -1,93 +1,34 @@ -\NeedsTeXFormat{LaTeX2e} -\ProvidesFile{ragged2e.ins} - [2019/04/14 v1.5 Installation script for Ragged2e Package (MS)] -%% -%% Copyright 1996..2019 by Martin Schr\"oder. -%% -%% This work may be distributed and/or modified under the -%% conditions of the LaTeX Project Public License, either version 1.3 -%% of this license or (at your option) any later version. -%% The latest version of this license is in -%% http://www.latex-project.org/lppl.txt -%% and version 1.3 or later is part of all distributions of LaTeX -%% version 2005/12/01 or later. -%% -%% This work has the LPPL maintenance status `maintained'. -%% -%% The Current Maintainer of this work is Martin Schr\"oder. -%% -%% This work consists of the files ragged2e.dtx and ragged2e.ins -%% and the derived file ragged2e.sty. -%% -%% --------------- start of docstrip commands ------------------ \input docstrip.tex -{\ifx\endbatchfile\undefined -\Msg{**********************************************} -\Msg{*} -\Msg{* This installation requires docstrip} -\Msg{* version 2.4d or later.} -\Msg{*} -\Msg{* An older version of docstrip has been input} -\Msg{*} -\Msg{**********************************************} -\errhelp{Move or rename old docstrip.tex.} -\errmessage{Old docstrip in input path} -\batchmode -\csname @@end\endcsname -\fi} -\Msg{***********************************************************} -\Msg{*} -\Msg{* The ragged2e distribution contains these files:} -\Msg{*} -\Msg{* \space\space ragged2e.dtx} -\Msg{* \space\space ragged2e.ins} -\Msg{*} -\Msg{* If you receive only some of these files from someone, complain!} -\Msg{*} -\Msg{***********************************************************} +\NeedsTeXFormat{LaTeX2e} +\ProvidesFile{ragged2e.ins} + [2020/02/05 v3.0 Installation script for Ragged2e Package] \preamble - -Copyright 1996..2019 Martin Schroeder. - -This file is part of the Ragged2e package ------------------------------------------ +Copyright (C) 1996–2019 Martin Schröder, 2021 Marei Peischl (peiTeX) <marei@peitex.de> This work may be distributed and/or modified under the -conditions of the LaTeX Project Public License, either version 1.3 +conditions of the LaTeX Project Public License, either version 1.3c of this license or (at your option) any later version. The latest version of this license is in - http://www.latex-project.org/lppl.txt -and version 1.3 or later is part of all distributions of LaTeX +http://www.latex-project.org/lppl.txt +and version 1.3c or later is part of all distributions of LaTeX version 2005/12/01 or later. This work has the LPPL maintenance status `maintained'. -The Current Maintainer of this work is Martin Schroeder. +The Current Maintainer of this work is + Marei Peischl <marei@peitex.de>. This work consists of the files ragged2e.dtx and ragged2e.ins and the derived file ragged2e.sty. \endpreamble -\declarepreamble\driverpreamble - -Copyright 1996..2019 Martin Schroeder. - -This file is part of the Ragged2e package ------------------------------------------ - -To produce the documentation in the way you like you are allowed -to change this driver file. - -\endpreamble - \keepsilent \askforoverwritefalse -\generate{\file{ragged2e.sty}{\from{ragged2e.dtx}{package}} - \usepreamble\driverpreamble - \file{ragged2e.drv}{\from{ragged2e.dtx}{driver}} - } +\generate{% + \file{ragged2e.sty}{\from{ragged2e.dtx}{package}} +} \Msg{***********************************************************} \Msg{*} @@ -96,7 +37,7 @@ to change this driver file. \Msg{*} \Msg{* \space\space ragged2e.sty} \Msg{*} -\Msg{* To produce the documentation run the file ragged2e.drv} +\Msg{* To produce the documentation run the file ragged2e.dtx} \Msg{* through LaTeX.} \Msg{*} \Msg{* Happy TeXing} @@ -104,4 +45,3 @@ to change this driver file. \endbatchfile %% %% End of file `ragged2e.ins'. -%% vim:syntax=tex:tw=70:ts=2 |