summaryrefslogtreecommitdiff
path: root/Master/texmf-dist/source/latex
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2018-08-26 21:26:43 +0000
committerKarl Berry <karl@freefriends.org>2018-08-26 21:26:43 +0000
commit5c4fcece888ee328ff7d9a04ca94e053bc279749 (patch)
tree9803f80c4e285c0949b76b1c0d9e295e2b32e40d /Master/texmf-dist/source/latex
parent4b1798930ac65eee9c833921c883645b11160769 (diff)
lettrine (26aug18)
git-svn-id: svn://tug.org/texlive/trunk@48492 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master/texmf-dist/source/latex')
-rw-r--r--Master/texmf-dist/source/latex/lettrine/lettrine.dtx92
-rw-r--r--Master/texmf-dist/source/latex/lettrine/lettrine.ins31
2 files changed, 77 insertions, 46 deletions
diff --git a/Master/texmf-dist/source/latex/lettrine/lettrine.dtx b/Master/texmf-dist/source/latex/lettrine/lettrine.dtx
index 44609d437b8..9d4e9b4bf52 100644
--- a/Master/texmf-dist/source/latex/lettrine/lettrine.dtx
+++ b/Master/texmf-dist/source/latex/lettrine/lettrine.dtx
@@ -1,5 +1,5 @@
%
-% \CheckSum{636}
+% \CheckSum{609}
%
% \iffalse meta-comment
%
@@ -20,14 +20,14 @@
% \iffalse
%
%<*sty>
-\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\NeedsTeXFormat{LaTeX2e}[2018-04-01]
\ProvidesFile{lettrine.sty}
%</sty>
%<*dtx>
\ProvidesFile{lettrine.dtx}
%</dtx>
%<*!cfg>
- [2018/08/18 v2.1 (Daniel Flipo)]
+ [2018-08-25 v2.2 (Daniel Flipo)]
%</!cfg>
%
% Lettrine package for LaTeX version 2e
@@ -211,7 +211,7 @@
% the top of the non accented letters).
% \end{description}
%
-% \item \lopt{refstring}\,\footnote{Unlike \lopt{grid} or
+% \item \lopt{refstring}\footnote{Unlike \lopt{grid} or
% \lopt{realheight}, \lopt{refstring} is not a flag
% (\emph{do not} add \lopt{=true}!); it is possible to set
% \lopt{refstring=}\meta{string} to override
@@ -264,7 +264,6 @@
% \item |\LettrineOnGridfalse|,
% \item |\LettrineRealHeightfalse|,
% \item |\LettrineSelfReffalse|,
-% \item |\LettrineVonefalse|,
% \item |\setlength{\DefaultFindent}{0pt}|,
% \item |\setlength{\DefaultNindent}{0.5em}|,
% \item |\setlength{\DefaultSlope}{0pt}|.
@@ -308,7 +307,7 @@
% | \fontshape{sl}}|,\\
% selects Palatino bold expanded slanted for the dropped capital.\\
% |\LettrineFontHook| can also be used to change the colour of
-% all lettrines in a (part of) document:
+% all initials in a (part of) document:
% |\renewcommand{\LettrineFontHook}{\color[gray]{0.5}}| \\
% will colour the initials following this command in grey.
%
@@ -329,9 +328,8 @@
% of your document.
% The EC fonts are also available in type1 format for free
% (thanks to Vladimir Volovich, they are called cm-super), and
-% adding |\usepackage{type1ec}|%
-% \footnote{This package, available on CTAN, was first released
-% on 2002/07/30.}
+% adding |\usepackage{type1ec}|\footnote{This package, available on
+% CTAN, was first released on 2002/07/30.}
% in the preamble will make them fully scalable too.
% So, if you want \file{lettrine.sty} to work properly with CM
% or EC fonts, you will need \emph{PostScript versions} of these
@@ -373,23 +371,55 @@
% or XeTeX engines with OpenType fonts may be an option
% (some TFM files for Type1 fonts are slightly inaccurate).
% \item |\LettrineTestString|’s value has changed over the time;
-% to achieve strict backward compatibility with previous versions,
-% please look at the end of \file{lettrine.cfg} and consider adding
-% the \lopt{Vone} option to the |\lettrine| command or setting
-% |\LettrineVonetrue| for global action on the whole document.
+% these changes may result in slight size differences for the
+% initial. Starting with version~2.2, the lettrine package takes
+% advantage of the rollback facilities recently introduced by
+% the LaTeX Team\footnote{A LaTeX kernel dated 2018-04-01 or
+% newer is required.}. Three rollback versions are provided in
+% order to produce exactly the same output as with former
+% versions: you can request
+% |\usepackage{lettrine}[=v1.6]|\footnote{Don’t forget the
+% \texttt{=} sign!} for 1999-2012 documents or
+% |\usepackage{lettrine}[=v1.9]| (documents from 2012 to
+% July 2018) or |\usepackage{lettrine}[=v2.0]| (August 2018).
+% Using any date in ISO format works too:
+% |\usepackage{lettrine}[=2014-03-15]| will load v1.9.
% \end{itemize}
%
% \StopEventually{}
%
% \section{\TeX{}nical details}
%
-% This package only runs with \LaTeXe{} and requires keyval.sty
% \iffalse
%<*sty>
% \fi
%
+% \changes{v2.2}{2018/08/25}{Rollback mechanism used for recovering
+% older versions.}
+%
+% The lettrine package now uses the rollback mechanism recently
+% introduced by the LaTeX Team to provide easier backward
+% compatibility. This requires a recent LaTeX kernel (at least
+% 2018-04-01), roolback is ignored with older kernels.
+% \begin{macrocode}
+\ifdefined\DeclareRelease
+ \DeclareRelease{v1.6}{1999-03-03}{lettrine-2006-03-17.sty}
+ \DeclareRelease{v1.9}{2012-07-20}{lettrine-2015-08-31.sty}
+ \DeclareRelease{v2.0}{2018-07-21}{lettrine-2018-08-18.sty}
+ \DeclareCurrentRelease{}{2018-08-18}
+\else
+ \PackageWarning{lettrine}{Your LaTeX kernel is too old to provide
+ access\MessageBreak to former versions of the lettrine package.%
+ \MessageBreak If you need rollback, please upgrade%
+ \MessageBreak your LaTeX kernel (2018-04-01 or newer),%
+ \MessageBreak otherwise you are fine; reported}
+\fi
+% \end{macrocode}
+%
+% This package only runs with \LaTeXe{} and requires files
+% \file{keyval.sty} and \file{minifp.sty}.
+%
% \begin{macrocode}
-\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\RequirePackage{keyval,minifp}
% \end{macrocode}
%
@@ -408,10 +438,10 @@
% compatibility with previous releases.}
%
% \changes{v2.1}{2018/08/14}{Newif \cs{ifLettrineVone} and
-% new option `Vone'.}
+% new option `Vone' (removed in v2.2, rollback prefered).}
%
-% \changes{v2.1}{2018/08/14}{Newif \cs{ifLettrineSelfRef} and
-% new option `refstring'.}
+% \changes{v2.1}{2018/08/14}{New option `refstring' and newif
+% \cs{ifLettrineSelfRef}.}
%
% \begin{macrocode}
\newcounter{DefaultLines}
@@ -432,7 +462,6 @@
\newif\ifLettrineImage
\newif\ifLettrineOnGrid
\newif\ifLettrineRealHeight
-\newif\ifLettrineVone
\newif\ifLettrineSelfRef
% \end{macrocode}
%
@@ -471,7 +500,6 @@
\newif\ifL@image
\newif\ifL@grid
\newif\ifL@realh
-\newif\ifL@vone
\newif\ifL@selfref
% \end{macrocode}
%
@@ -625,22 +653,9 @@
% Up to v2.01, possible values for |\L@factor| were either 1 or any
% value $\geq 1.1$ which was fine for almost every font but not
% all (i.e.\ \file{cfr-initials}). Starting with v2.1, |\L@factor|
-% is computed more accurately by \file{minifp.sty}; option
-% \lopt{Vone} is provided for backward compatibility.
+% is computed more accurately by \file{minifp.sty}.
% \begin{macrocode}
- \ifL@vone
- \multiply\@tempcntb by 100
- \divide\@tempcnta by 100
- \divide\@tempcntb by \@tempcnta
- \advance\@tempcntb by -9999
- \ifnum\@tempcntb>0
- \def\L@factor{1.\the\@tempcntb}%
- \else
- \def\L@factor{1}%
- \fi
- \else
- \MFPdiv{\the\@tempcntb}{\the\@tempcnta}\L@factor
- \fi
+ \MFPdiv{\the\@tempcntb}{\the\@tempcnta}\L@factor
\fi
}
% \end{macrocode}
@@ -700,7 +715,6 @@
\define@key{L}{novskip}{\setlength{\L@novskip}{#1}}
\define@key{L}{refstring}[\l@initial]{\L@selfreftrue
\def\l@refstring{#1}}
-\define@key{L}{Vone}[true]{\csname L@vone#1\endcsname}
% \end{macrocode}
%
% \changes{v1.5}{2003/08/18}{\cs{LettrineOptionsFor} and
@@ -749,7 +763,6 @@
\ifLettrineImage\L@imagetrue\else\L@imagefalse\fi
\ifLettrineOnGrid\L@gridtrue\else\L@gridfalse\fi
\ifLettrineRealHeight\L@realhtrue\else\L@realhfalse\fi
- \ifLettrineVone\L@vonetrue\else\L@vonefalse\fi
\ifLettrineSelfRef\L@selfreftrue\else\L@selfreffalse\fi
% \end{macrocode}
%
@@ -1057,15 +1070,10 @@
%%\LettrineOnGridfalse
%%\LettrineRealHeightfalse
%%\LettrineSelfReffalse
-%%\LettrineVonefalse
%%
%% Theses are *commands* (value=string, only height matters):
%%\renewcommand*{\LettrineTestString}{EFTZ}
%%\renewcommand*{\LettrineSecondString}{x}
-%% For backward compatibility with versions 1.63 to 1.9:
-%%\renewcommand*{\LettrineTestString}{ABCDEFGHIJKLMNOQPRSTUVWXYZ}
-%% For backward compatibility with versions up to 1.62:
-%%\renewcommand*{\LettrineTestString}{X}
%%
%% In case you want to set parameters for some letters
%% in file `optfile.cfl'
diff --git a/Master/texmf-dist/source/latex/lettrine/lettrine.ins b/Master/texmf-dist/source/latex/lettrine/lettrine.ins
index 63f5f435bbc..2f74f98f4df 100644
--- a/Master/texmf-dist/source/latex/lettrine/lettrine.ins
+++ b/Master/texmf-dist/source/latex/lettrine/lettrine.ins
@@ -1,6 +1,10 @@
%%
%% Copyright (C) 1999-2018 Daniel Flipo.
%%
+%% This file will generate fast loadable files and documentation
+%% driver files from the doc files in this package when run through
+%% LaTeX or TeX.
+%%
%% This program can be distributed and/or modified under the terms
%% of the LaTeX Project Public License either version 1.3c of this
%% license or (at your option) any later version.
@@ -9,10 +13,6 @@
%% and version 1.3c or later is part of all distributions of LaTeX
%% version 2005/12/01 or later.
%%
-%% This file will generate fast loadable files and documentation
-%% driver files from the doc files in this package when run through
-%% LaTeX or TeX.
-%%
\def\batchfile{lettrine.ins}
\input docstrip.tex
@@ -36,6 +36,29 @@
\usedir{tex/latex/lettrine}
+\preamble
+
+This file is a generated file part of the lettrine package.
+-----------------------------------------------------------
+
+For the copyright see the source file lettine.dtx.
+
+This file can be distributed and/or modified under the terms
+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 Daniel Flipo.
+
+Please report errors to: <daniel (dot) flipo (at) free (dot) fr>
+
+\endpreamble
+
\generate{\file{lettrine.sty}{\from{lettrine.dtx}{sty}}
\nopreamble
\file{lettrine.cfg}{\from{lettrine.dtx}{cfg}}