summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-06-04 21:11:27 +0000
committerKarl Berry <karl@freefriends.org>2020-06-04 21:11:27 +0000
commitd385fa2e35ba4cb9319e8bf59b8df6bed815f92f (patch)
tree43206559edf65491b6060146cfcf7056375a58f8 /Master
parent092dff4bfcbe6db899f2ae3f6074a0a76686d6c1 (diff)
ellipsis (4jun20)
git-svn-id: svn://tug.org/texlive/trunk@55418 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/latex/ellipsis/README.md8
-rw-r--r--Master/texmf-dist/doc/latex/ellipsis/ellipsis.pdfbin215749 -> 216835 bytes
-rw-r--r--Master/texmf-dist/source/latex/ellipsis/ellipsis.dtx121
-rw-r--r--Master/texmf-dist/source/latex/ellipsis/ellipsis.ins56
-rw-r--r--Master/texmf-dist/tex/latex/ellipsis/ellipsis.sty34
-rwxr-xr-xMaster/tlpkg/libexec/ctan2tds1
6 files changed, 111 insertions, 109 deletions
diff --git a/Master/texmf-dist/doc/latex/ellipsis/README.md b/Master/texmf-dist/doc/latex/ellipsis/README.md
index b7b555e565c..169dde7265e 100644
--- a/Master/texmf-dist/doc/latex/ellipsis/README.md
+++ b/Master/texmf-dist/doc/latex/ellipsis/README.md
@@ -4,13 +4,11 @@ If you have ever tried to print something like [...] in LateX text mode, you may
Ellipsis.sty is a package that attempts to solve this problem by only adding the extra space in cases where the ellipsis is followed immediately by a punctuation character that should be spaced evenly with respect to the internal spacing between the three dots of the ellipsis. The package is described on p.~82 of the second edition of The LaTeX Companion.
-Get the package from [CTAN](https://www.ctan.org/pkg/ellipsis).
+[CTAN](https://www.ctan.org/pkg/ellipsis)
-Alternatively, run latex on ellipsis.ins to generate the ellipsis.sty file, and then run latex on ellipsis.dtx to generate the documentation. Put the file
-ellipsis.sty where LaTeX will find it, and refresh TeX's list of
-available files.
+[Github](https://github.com/pjheslin/ellipsis)
-See the PDF file for full documentation.
+See the [PDF file](http://mirrors.ctan.org/macros/latex/contrib/ellipsis/ellipsis.pdf) for full documentation.
Peter Heslin
p.j.heslin@dur.ac.uk
diff --git a/Master/texmf-dist/doc/latex/ellipsis/ellipsis.pdf b/Master/texmf-dist/doc/latex/ellipsis/ellipsis.pdf
index 762e9cb36b6..79ff974ed71 100644
--- a/Master/texmf-dist/doc/latex/ellipsis/ellipsis.pdf
+++ b/Master/texmf-dist/doc/latex/ellipsis/ellipsis.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/ellipsis/ellipsis.dtx b/Master/texmf-dist/source/latex/ellipsis/ellipsis.dtx
index 42462ab2a25..6cdc6c0994e 100644
--- a/Master/texmf-dist/source/latex/ellipsis/ellipsis.dtx
+++ b/Master/texmf-dist/source/latex/ellipsis/ellipsis.dtx
@@ -1,25 +1,75 @@
% \iffalse meta-comment
+%<*package>
+%%
+%% Copyright (C) 2003-2020 by Peter Heslin <p.j.heslin@dur.ac.uk>
+%% ---------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, version 1.3c of the 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 "author-maintained".
+%%
+%% The current maintainer and author of this work is Peter Heslin.
+%%
+%</package>
+% \fi
%
-% Copyright (C) 2003-20 by Peter Heslin <pheslin@gmail.com>
-% --------------------------------------------------
-%
-% This file may be distributed and/or modified under the conditions of
-% the LaTeX Project Public License, either version 1.2 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.2 or later is part of all distributions of LaTeX
-% version 1999/12/01 or later.
-%
+% \iffalse
+%<*batch>
+\ifx\documentclass\undefined
+
+\input docstrip.tex
+\keepsilent
+\askforoverwritefalse
+\usedir{tex/latex/ellipsis}
+
+\preamble
+
+ellipsis -- fixes spacing around ellipses (three dots)
+
+\endpreamble
+
+\generate{\file{ellipsis.sty}{\from{ellipsis.dtx}{package}}}
+
+\obeyspaces
+\Msg{*************************************************************}
+\Msg{* *}
+\Msg{* To finish the installation you have to move the following *}
+\Msg{* file into a directory searched by TeX: *}
+\Msg{* *}
+\Msg{* ellipsis.sty *}
+\Msg{* *}
+\Msg{* To produce the documentation run the file ellipsis.dtx *}
+\Msg{* through LaTeX. *}
+\Msg{* *}
+\Msg{* Happy TeXing! *}
+\Msg{* *}
+\Msg{*************************************************************}
+
+\else
+
+\let\endbatchfile\relax
+
+\fi
+\endbatchfile
+%</batch>
% \fi
%
% \iffalse
%<package>\NeedsTeXFormat{LaTeX2e}
-%<package>\ProvidesPackage{ellipsis}
-%<package> [2020/5/22 v1.7 ellipsis: fixes spacing around \dots]
-%
+%<*driver>
+\ifx\ProvidesFile\undefined\def\ProvidesFile#1[#2]{}\fi
+\ProvidesFile{ellipsis.dtx}%
+%</driver>
+%<package>\ProvidesPackage{ellipsis}%
+ [2020/05/22 v1.8 fixes spacing around ellipses (three dots)]
%<*driver>
\documentclass{ltxdoc}
\usepackage{ellipsis}
@@ -68,6 +118,7 @@
% \changes{v1.7}{2020/5/22}{Fixed incompatilbility with amsmath; fixed fragile
% command; fixed spacing when \cs{nofrenchspacing}; all fixes thanks to Frank
% Mittelbach. Added ref to xellipsis package.}
+% \changes{v1.8}{2004/9/28}{Code cleanups contributed by Falk Hanisch.}
%
% \GetFileInfo{ellipsis.sty}
%
@@ -75,7 +126,10 @@
% corresponds to \textsf{ellipsis}~\fileversion, dated \filedate.
% Many thanks to Frank Mittelbach, who made numerous suggestions
% and bugfixes that greatly improved this package.}}
-% \author{Peter J. Heslin \\ \texttt{p.j.heslin@dur.ac.uk}}
+% \author{^^A
+% Peter J. Heslin\\^^A
+% \texttt{p.j.heslin@dur.ac.uk}\\^^A
+% \texttt{https://github.com/pjheslin/ellipsis}}
%
% \maketitle
%
@@ -106,12 +160,12 @@
% consists in the fact that \LaTeX\ always adds it, regardless of what text
% follows.
%
-% This package implements a simple fix. It redefines the |\dots| and
-% |\textellipsis| commands so that they can look ahead at the next character and
-% change their behavior accordingly: if the next character is one of .,;:?! the
-% extra space is added, if not, no extra space is added (if you load a package
-% that makes any of these characters active, you may want to reload this list;
-% see the section below on see below on |\ellipsispunctuation| and
+% This package implements a simple fix. It redefines the commands |\dots| and
+% |\textellipsis| so that they can look ahead at the next character and change
+% their behavior accordingly: if the next character is one of \texttt{.,;:?!}
+% the extra space is added, if not, no extra space is added (if you load a
+% package that makes any of these characters active, you may want to reload
+% this list; see the section below on see below on |\ellipsispunctuation| and
% compatibility). This particular list of punctuation marks was not chosen
% arbitrarily: it includes all marks with a dot on the baseline (or a comma,
% which is like a dot with a tail). These marks produce a series of four dots
@@ -134,7 +188,7 @@
% own set of rules for the spacing before and after an ellipsis. The latter
% offers more flexibility, but also tends to prefer the Chicago/MLA style. The
% Chicago and MLA manuals are good guides for preparing a typescript that will
-% be typeset by someone else; but for fine typography, they are they wrong
+% be typeset by someone else; but for fine typography, they are the wrong
% authorities to follow.
%
% Traditional typographers firmly reject the Chicago style of setting ellipses,
@@ -145,12 +199,11 @@
%
% \DescribeMacro{chicago} If you nevertheless want or have to use the
% Chicago-style, widely spaced ellipsis with this package, you can pass it the
-% option |chicago|, like so: |\usepackage[chicago]{ellipsis}|. If, on the other
-% hand, you want to adhere to the full recommendations of the Chicago manual,
-% then you should probably use \textsf{lips} or \textsf{xellipsis} instead of
-% this package. \DescribeMacro{mla} \textsf{Ellipsis.sty} also has an |mla|
-% package option, modeled on the same feature of \textsf{lips.sty}, which
-% automatically puts square brackets around all ellipses.
+% package option |chicago|. \DescribeMacro{mla} There is also package option
+% |mla|, modeled on the same feature of \textsf{lips.sty}, which automatically
+% puts square brackets around all ellipses. If, on the other hand, you want to
+% adhere to the full recommendations of the Chicago manual, then you should
+% consider using \textsf{lips} or \textsf{xellipsis} instead of this package.
%
% In conclusion, the best solution to the problem of typesetting ellipses is not
% to use this package at all, but to use XeTeX. You can put the Unicode
@@ -158,8 +211,8 @@
% precomposed ellipsis glyph. If you use a professional-quality OpenType font,
% it will have an ellipsis glyph created by the type designer to fit with the
% typeface and with proper kerning for punctuation afterward. Not all fonts do
-% this, so make sure that the ellipsis character kerns properly with following
-% .,:;!?
+% this, so make sure that the ellipsis character kerns properly with
+% \texttt{.,;:?!} following.
%
% \section{Usage}
%
@@ -297,7 +350,7 @@
%
% \begin{macro}{\ellipsis@default}
% This is the LaTeX default definition, which is necessary to use
-% when punctuation such as .,:;!? follows.
+% when punctuation such as \texttt{.,;:?!} follows.
% \begin{macrocode}
\newcommand{\ellipsis@default}{%
\ellipsis@before
@@ -359,7 +412,7 @@
\fi}
% \end{macrocode}
%
-% Here is the macro that looks ahead at the next token, put it in
+% Here is the actual macro that looks ahead at the next token, stores it in
% \cs{ellipsis@token}, and invokes the code to scan for it in the
% punctuation list.
%
diff --git a/Master/texmf-dist/source/latex/ellipsis/ellipsis.ins b/Master/texmf-dist/source/latex/ellipsis/ellipsis.ins
deleted file mode 100644
index 34cc622656b..00000000000
--- a/Master/texmf-dist/source/latex/ellipsis/ellipsis.ins
+++ /dev/null
@@ -1,56 +0,0 @@
-%%
-%% Copyright (C) 2003 by Peter Heslin <p.j.heslin@dur.ac.uk>
-%%
-%% This file may be distributed and/or modified under the conditions of
-%% the LaTeX Project Public License, either version 1.2 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.2 or later is part of all distributions of LaTeX version
-%% 1999/12/01 or later.
-%%
-
-\input docstrip.tex
-\keepsilent
-
-\usedir{tex/latex/ellipsis}
-
-\preamble
-
-This is a generated file.
-
-Copyright (C) 2003 by Peter Heslin <p.j.heslin@dur.ac.uk>
-
-This file may be distributed and/or modified under the conditions of
-the LaTeX Project Public License, either version 1.2 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.2 or later is part of all distributions of LaTeX version
-1999/12/01 or later.
-
-\endpreamble
-
-\generate{\file{ellipsis.sty}{\from{ellipsis.dtx}{package}}}
-
-\obeyspaces
-\Msg{*************************************************************}
-\Msg{* *}
-\Msg{* To finish the installation you have to move the following *}
-\Msg{* file into a directory searched by TeX: *}
-\Msg{* *}
-\Msg{* ellipsis.sty *}
-\Msg{* *}
-\Msg{* To produce the documentation run the file ellipsis.dtx *}
-\Msg{* through LaTeX. *}
-\Msg{* *}
-\Msg{* Happy TeXing! *}
-\Msg{* *}
-\Msg{*************************************************************}
-
-\endbatchfile
-
diff --git a/Master/texmf-dist/tex/latex/ellipsis/ellipsis.sty b/Master/texmf-dist/tex/latex/ellipsis/ellipsis.sty
index 8eba8ffa631..481bbf0bb84 100644
--- a/Master/texmf-dist/tex/latex/ellipsis/ellipsis.sty
+++ b/Master/texmf-dist/tex/latex/ellipsis/ellipsis.sty
@@ -6,23 +6,29 @@
%%
%% ellipsis.dtx (with options: `package')
%%
-%% This is a generated file.
+%% ellipsis -- fixes spacing around ellipses (three dots)
%%
-%% Copyright (C) 2003 by Peter Heslin <p.j.heslin@dur.ac.uk>
-%%
-%% This file may be distributed and/or modified under the conditions of
-%% the LaTeX Project Public License, either version 1.2 of this license
-%% or (at your option) any later version. The latest version of this
+%%
+%% Copyright (C) 2003-2020 by Peter Heslin <p.j.heslin@dur.ac.uk>
+%% ---------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the conditions
+%% of the LaTeX Project Public License, version 1.3c of the 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.2 or later is part of all distributions of LaTeX version
-%% 1999/12/01 or later.
-%%
+%%
+%% 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 "author-maintained".
+%%
+%% The current maintainer and author of this work is Peter Heslin.
+%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{ellipsis}
- [2020/5/22 v1.7 ellipsis: fixes spacing around \dots]
+\ProvidesPackage{ellipsis}%
+ [2020/05/22 v1.8 fixes spacing around ellipses (three dots)]
\newcommand{\ellipsisgap}{\fontdimen3\font}
\DeclareOption{chicago}{\renewcommand{\ellipsisgap}{\fontdimen2\font}}
\newcommand{\ellipsis@before}{}
diff --git a/Master/tlpkg/libexec/ctan2tds b/Master/tlpkg/libexec/ctan2tds
index b376fef4de9..a739a051f0f 100755
--- a/Master/tlpkg/libexec/ctan2tds
+++ b/Master/tlpkg/libexec/ctan2tds
@@ -2772,6 +2772,7 @@ my $core_latex = "$Master/texmf-dist/tex/latex";
'duckuments' => 'tex',
'ejpecp' => 'latex', # requires interaction
'ekaia' => 'latex', # requires interaction
+ 'ellipsis' => 'tex',
'elteikthesis' => 'latex', # requires interaction
'emisa' => 'pdflatex-preserve-pdf',
'engpron' => 'latex -translate-file=empty.tcx', # no 8-bit