From 5c4fcece888ee328ff7d9a04ca94e053bc279749 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Sun, 26 Aug 2018 21:26:43 +0000 Subject: lettrine (26aug18) git-svn-id: svn://tug.org/texlive/trunk@48492 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/lettrine/README | 6 +- Master/texmf-dist/doc/latex/lettrine/demo-de.pdf | Bin 136266 -> 136266 bytes Master/texmf-dist/doc/latex/lettrine/demo.pdf | Bin 145427 -> 144183 bytes Master/texmf-dist/doc/latex/lettrine/demo.tex | 13 - Master/texmf-dist/doc/latex/lettrine/lettrine.pdf | Bin 118358 -> 120941 bytes .../texmf-dist/source/latex/lettrine/lettrine.dtx | 92 +++---- .../texmf-dist/source/latex/lettrine/lettrine.ins | 31 ++- .../tex/latex/lettrine/lettrine-2006-03-17.sty | 198 +++++++++++++++ .../tex/latex/lettrine/lettrine-2015-08-31.sty | 247 ++++++++++++++++++ .../tex/latex/lettrine/lettrine-2018-08-18.sty | 278 +++++++++++++++++++++ Master/texmf-dist/tex/latex/lettrine/lettrine.cfg | 5 - Master/texmf-dist/tex/latex/lettrine/lettrine.sty | 60 ++--- 12 files changed, 833 insertions(+), 97 deletions(-) create mode 100644 Master/texmf-dist/tex/latex/lettrine/lettrine-2006-03-17.sty create mode 100644 Master/texmf-dist/tex/latex/lettrine/lettrine-2015-08-31.sty create mode 100644 Master/texmf-dist/tex/latex/lettrine/lettrine-2018-08-18.sty (limited to 'Master/texmf-dist') diff --git a/Master/texmf-dist/doc/latex/lettrine/README b/Master/texmf-dist/doc/latex/lettrine/README index fe1ad41f1a7..c5e5f062bd0 100644 --- a/Master/texmf-dist/doc/latex/lettrine/README +++ b/Master/texmf-dist/doc/latex/lettrine/README @@ -13,8 +13,8 @@ if you need to install it by yourself 2. run luatex on lettrine.ins to strip the comments and create lettrine.sty and lettrine.cfg 3. run luatex on contrib.dtx to produce the *.cfl files. -Files lettrine.sty, lettrine.cfg and *.cfl go to to a directory searched -by TeX, typically $TEXMF/tex/latex/lettrine. +Files lettrine.sty, lettrine.cfg, lettrine-*.sty and *.cfl go to to +a directory searched by TeX, typically $TEXMF/tex/latex/lettrine. Files README, demo*, *.pdf go to a doc directory, typically $TEXMF/doc/latex/lettrine. Files *.dtx, *.ins go to a source directory, typically @@ -31,4 +31,4 @@ in the complete documentation and code. -- Daniel Flipo, -July, 21th, 2018. +August, 25th, 2018. diff --git a/Master/texmf-dist/doc/latex/lettrine/demo-de.pdf b/Master/texmf-dist/doc/latex/lettrine/demo-de.pdf index 551c753ae8b..ea80e0c8c13 100644 Binary files a/Master/texmf-dist/doc/latex/lettrine/demo-de.pdf and b/Master/texmf-dist/doc/latex/lettrine/demo-de.pdf differ diff --git a/Master/texmf-dist/doc/latex/lettrine/demo.pdf b/Master/texmf-dist/doc/latex/lettrine/demo.pdf index cc4db2bc854..140cc231cbc 100644 Binary files a/Master/texmf-dist/doc/latex/lettrine/demo.pdf and b/Master/texmf-dist/doc/latex/lettrine/demo.pdf differ diff --git a/Master/texmf-dist/doc/latex/lettrine/demo.tex b/Master/texmf-dist/doc/latex/lettrine/demo.tex index 89af285e77d..572329ba81e 100644 --- a/Master/texmf-dist/doc/latex/lettrine/demo.tex +++ b/Master/texmf-dist/doc/latex/lettrine/demo.tex @@ -227,19 +227,6 @@ la Tour Carbonnière. Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès terrestre de la ville fortifiée, celle qui menait à Psalmody. -\vspace{.5\baselineskip} -\textit{N.B. : Les versions antérieures à 2.1 de - {\ttfamily\upshape lettrine.sty} donnaient une hauteur trop grande - à l’initiale (+15\%) comme on le voit avec l’option {\ttfamily\upshape Vone} : -} - -\verb+\lettrine[Vone, lines=3]{A}{u} bord du marais+ - -\lettrine[Vone, lines=3]{A}{u} bord du marais de la Souteyranne, -à quelques kilomètres au nord d'Aigues-Mortes, se trouve la Tour Carbonnière. -Construite au XIII\ieme~siècle, elle contrôlait l'unique voie d'accès -terrestre de la ville fortifiée, celle qui menait à Psalmody. - \newpage \restoregeometry \begin{center} diff --git a/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf b/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf index 3587f033d10..e11b26889a8 100644 Binary files a/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf and b/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf differ 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} % %<*dtx> \ProvidesFile{lettrine.dtx} % %<*!cfg> - [2018/08/18 v2.1 (Daniel Flipo)] + [2018-08-25 v2.2 (Daniel Flipo)] % % % 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: + +\endpreamble + \generate{\file{lettrine.sty}{\from{lettrine.dtx}{sty}} \nopreamble \file{lettrine.cfg}{\from{lettrine.dtx}{cfg}} diff --git a/Master/texmf-dist/tex/latex/lettrine/lettrine-2006-03-17.sty b/Master/texmf-dist/tex/latex/lettrine/lettrine-2006-03-17.sty new file mode 100644 index 00000000000..c149b5fffe4 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lettrine/lettrine-2006-03-17.sty @@ -0,0 +1,198 @@ +%% +%% This is file `lettrine.sty' v1.6. +%% +%% IMPORTANT NOTICE: +%% +%% For the copyright see the source file `lettrine.dtx'. +%% +%% Any modified versions of this file must be renamed +%% with new filenames distinct from lettrine.sty. +%% +%% For distribution of the original source see the terms +%% for copying and modification in the file lettrine.dtx. +%% +%% This generated file may be distributed as long as the +%% original source files, as listed above, are part of the +%% same distribution. (The sources need not necessarily be +%% in the same archive or directory.) +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\ProvidesFile{lettrine.sty} + [2006/03/17 v1.6 (Daniel Flipo)] +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\RequirePackage{keyval} +\newcounter{DefaultLines} +\setcounter{DefaultLines}{2} +\newcommand*{\DefaultOptionsFile}{\relax} +\newcommand*{\DefaultLoversize}{0} +\newcommand*{\DefaultLraise}{0} +\newcommand*{\DefaultLhang}{0} +\newdimen\DefaultFindent +\setlength{\DefaultFindent}{\z@} +\newdimen\DefaultNindent +\setlength{\DefaultNindent}{0.5em} +\newdimen\DefaultSlope +\setlength{\DefaultSlope}{\z@} +\newif\ifLettrineImage +\newsavebox{\L@lbox} +\newsavebox{\L@tbox} +\newcounter{L@lines} +\newdimen\L@Pindent +\newdimen\L@Findent +\newdimen\L@Nindent +\newdimen\L@lraise +\newdimen\L@first +\newdimen\L@next +\newdimen\L@slope +\newdimen\L@height +\newcommand*{\L@file}{} +\newcommand*{\L@hang}{} +\newcommand*{\L@oversize}{} +\newcommand*{\L@raise}{} +\newcommand*{\L@ante}{} +\newif\ifL@image +\newcommand*{\LettrineTextFont}{\scshape} +\def\Lettrine@height{% + \@tempdima=\baselineskip + \setlength{\L@height}{\theL@lines\@tempdima}% + \ifnum\theL@lines>1 + \addtolength{\L@height}{-\@tempdima}% + \fi + \sbox{\L@tbox}{\LettrineTextFont x}% + \addtolength{\L@height}{\ht\L@tbox}% + \addtolength{\L@height}{\L@oversize\L@height}} +\newcommand*{\LettrineFontHook}{} +\newcommand*{\LettrineTestString}{X} +\newcommand*{\LettrineFont}{% + \Lettrine@height + \sbox{\L@tbox}{\LettrineFontHook\fontsize{\L@height}{\L@height}% + \selectfont \LettrineTestString}% + \@tempcntb=\ht\L@tbox + \@tempcnta=\L@height + \multiply\@tempcnta by 100 + \divide\@tempcntb by 100 + \divide\@tempcnta by \@tempcntb + \advance\@tempcnta by -9999 + \ifnum\@tempcnta>0 + \def\@tempa{1.\the\@tempcnta}% + \else + \def\@tempa{1}% + \fi + \LettrineFontHook + \fontsize{\@tempa\L@height}{\@tempa\L@height}% + \selectfont +} +\newcommand*{\LettrineFontEPS}{% + \Lettrine@height\LettrineFontHook + \includegraphics[height=\L@height]} +\define@key{L}{lines}{\setcounter{L@lines}{#1}} +\define@key{L}{lhang}{\renewcommand*{\L@hang}{#1}} +\define@key{L}{loversize}{\renewcommand*{\L@oversize}{#1}} +\define@key{L}{lraise}{\renewcommand*{\L@raise}{#1}} +\define@key{L}{ante}{\renewcommand*{\L@ante}{#1}} +\define@key{L}{findent}{\setlength{\L@Findent}{#1}} +\define@key{L}{nindent}{\setlength{\L@Nindent}{#1}} +\define@key{L}{slope}{\setlength{\L@slope}{#1}} +\define@key{L}{image}[true]{\csname L@image#1\endcsname} +\newcommand*{\LettrineOptionsFor}[2]{\@namedef{l@#1-keys}{#2}} +\newdimen\LettrineWidth +\newdimen\LettrineHeight +\newdimen\LettrineDepth +\def\lettrine{\@ifnextchar[\@lettrine{\@lettrine[]}} +\def\@lettrine[#1]#2#3{% + \setcounter{L@lines}{\theDefaultLines}% + \renewcommand*{\L@hang}{\DefaultLhang}% + \renewcommand*{\L@oversize}{\DefaultLoversize}% + \renewcommand*{\L@raise}{\DefaultLraise}% + \renewcommand*{\L@ante}{}% + \setlength{\L@Findent}{\DefaultFindent}% + \setlength{\L@Nindent}{\DefaultNindent}% + \setlength{\L@slope}{\DefaultSlope}% + \ifLettrineImage\L@imagetrue\else\L@imagefalse\fi + \if\DefaultOptionsFile\relax + \else + \begingroup + \InputIfFileExists{\DefaultOptionsFile}% + {}% + {\PackageWarning{lettrine.sty}% + {File \DefaultOptionsFile\space not found}% + }% + \def\color##1##{\l@color{##1}}% + \let\l@color\@gobbletwo + \def\textcolor##1##{\l@textcolor{##1}}% + \def\l@textcolor##1##2##3{##3}% + \expandafter\ifx\csname l@#2-keys\endcsname\relax + \gdef\l@LOKeys{}% + \else + \xdef\l@LOKeys{\csname l@#2-keys\endcsname}% + \fi + \endgroup + \def\KV@prefix{KV@L@}% + \let\@tempc\relax + \expandafter\KV@do\l@LOKeys,\relax, + \sbox{\L@lbox}{\LettrineFont #2}% + \setlength{\LettrineWidth}{\wd\L@lbox}% + \def\KV@prefix{KV@L@}% + \let\@tempc\relax + \expandafter\KV@do\l@LOKeys,\relax, + \fi + \setkeys{L}{#1}% + \ifL@image + \sbox{\L@lbox}{\LettrineFontEPS{#2}}% + \else + \sbox{\L@lbox}{\LettrineFont #2}% + \fi + \sbox{\L@tbox}{\LettrineTextFont{#3}}% + \@tempdima=\baselineskip + \ifnum\theL@lines=1 + \setlength{\L@first}{\ht\L@lbox}% + \addtolength{\L@first}{-\ht\L@tbox}% + \setlength{\L@lraise}{\z@}% + \else + \setlength{\L@first}{-\theL@lines\@tempdima}% + \addtolength{\L@first}{\@tempdima}% + \sbox{\@tempboxa}{\LettrineTextFont x}% + \addtolength{\L@first}{-\ht\@tempboxa}% + \setlength{\L@lraise}{-\L@raise\L@first}% + \addtolength{\L@first}{\L@lraise}% + \addtolength{\L@first}{\ht\L@lbox}% + \addtolength{\L@lraise}{-\theL@lines\@tempdima}% + \addtolength{\L@lraise}{\@tempdima}% + \fi + \par + \ifdim\L@first>0.2\p@\vskip\L@first\fi + \setlength{\L@Pindent}{\wd\L@lbox}% + \addtolength{\L@Pindent}{-\L@hang\wd\L@lbox}% + \settowidth{\L@first}{\L@ante}% + \addtolength{\L@Pindent}{\L@first}% + \addtolength{\L@Pindent}{\L@Findent}% + \setlength{\L@first}{\linewidth}% + \addtolength{\L@first}{-\L@Pindent}% + \addtolength{\L@Nindent}{\L@Pindent}% + \setlength{\L@next}{\linewidth}% + \addtolength{\L@next}{-\L@Nindent}% + \addtolength{\L@Pindent}{\rightmargin}% + \addtolength{\L@Nindent}{\rightmargin}% + \setlength{\LettrineWidth}{\wd\L@lbox}% + \setlength{\LettrineHeight}{\ht\L@lbox}% + \setlength{\LettrineDepth}{\dp\L@lbox}% + \addtocounter{L@lines}{1}% + \def\L@parshape{\c@L@lines \the\L@Pindent \the\L@first}% + \@tempcnta=\tw@ + \@whilenum \@tempcnta<\c@L@lines\do{% + \edef\L@parshape{\L@parshape \the\L@Nindent \the\L@next}% + \addtolength{\L@Nindent}{\L@slope}% + \addtolength{\L@next}{-\L@slope}% + \advance\@tempcnta\@ne}% + \edef\L@parshape{\L@parshape \rightmargin \the\linewidth}% + \noindent + \parshape=\L@parshape\relax + \smash{\llap{\mbox{\L@ante}\raisebox{\L@lraise}{\usebox{\L@lbox}}% + \hskip \the\L@Findent}}% + \usebox{\L@tbox}% +} +\InputIfFileExists{lettrine.cfg} + {\typeout{Loading lettrine.cfg}} + {\typeout{lettrine.cfg not found, using default values}} +\endinput +%% +%% End of file `lettrine.sty'. diff --git a/Master/texmf-dist/tex/latex/lettrine/lettrine-2015-08-31.sty b/Master/texmf-dist/tex/latex/lettrine/lettrine-2015-08-31.sty new file mode 100644 index 00000000000..fac9d05d80a --- /dev/null +++ b/Master/texmf-dist/tex/latex/lettrine/lettrine-2015-08-31.sty @@ -0,0 +1,247 @@ +%% +%% This is file `lettrine.sty' v1.9. +%% +%% IMPORTANT NOTICE: +%% +%% For the copyright see the source file `lettrine.dtx'. +%% +%% Any modified versions of this file must be renamed +%% with new filenames distinct from lettrine.sty. +%% +%% For distribution of the original source see the terms +%% for copying and modification in the file lettrine.dtx. +%% +%% This generated file may be distributed as long as the +%% original source files, as listed above, are part of the +%% same distribution. (The sources need not necessarily be +%% in the same archive or directory.) +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\ProvidesFile{lettrine.sty} + [2015/08/31 v1.9 (Daniel Flipo)] +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\RequirePackage{keyval} +\newcounter{DefaultLines} +\setcounter{DefaultLines}{2} +\newcounter{DefaultDepth} +\newcommand*{\DefaultOptionsFile}{\relax} +\newcommand*{\DefaultLoversize}{0} +\newcommand*{\DefaultLraise}{0} +\newcommand*{\DefaultLhang}{0} +\newdimen\DefaultFindent +\setlength{\DefaultFindent}{\z@} +\newdimen\DefaultNindent +\setlength{\DefaultNindent}{0.5em} +\newdimen\DefaultSlope +\setlength{\DefaultSlope}{\z@} +\newdimen\DiscardVskip +\setlength{\DiscardVskip}{0.2\p@} +\newif\ifLettrineImage +\newif\ifLettrineOnGrid +\newif\ifLettrineRealHeight +\newsavebox{\L@lbox} +\newsavebox{\L@tbox} +\newcounter{L@lines} +\newcounter{L@depth} +\newdimen\L@Pindent +\newdimen\L@Findent +\newdimen\L@Nindent +\newdimen\L@lraise +\newdimen\L@first +\newdimen\L@next +\newdimen\L@slope +\newdimen\L@height +\newdimen\L@novskip +\newcommand*{\L@file}{} +\newcommand*{\L@hang}{} +\newcommand*{\L@oversize}{} +\newcommand*{\L@raise}{} +\newcommand*{\L@ante}{} +\newif\ifL@image +\newif\ifL@grid +\newif\ifL@realh +\newcommand*{\LettrineTextFont}{\scshape} +\def\Lettrine@height{% + \@tempdima=\baselineskip + \setlength{\L@height}{\value{L@lines}\@tempdima}% + \ifnum\value{L@lines}>1 + \addtolength{\L@height}{-\@tempdima}% + \fi + \ifvoid\L@tbox + \sbox{\L@tbox}{\LettrineTextFont{\LettrineSecondString}}% + \fi + \addtolength{\L@height}{\ht\L@tbox}% + \addtolength{\L@height}{\L@oversize\L@height}% +} +\newcommand*{\LettrineFontHook}{} +\newcommand*{\LettrineTestString}{ABCDEFGHIJKLMNOQPRSTUVWXYZ} +\newcommand*{\LettrineSecondString}{x} +\newcommand*{\LettrineFont}{% + \Lettrine@height + \sbox{\@tempboxa}{\LettrineFontHook\fontsize{\L@height}{\L@height}% + \selectfont \LettrineTestString}% + \@tempcntb=\ht\@tempboxa + \@tempcnta=\L@height + \multiply\@tempcnta by 100 + \divide\@tempcntb by 100 + \divide\@tempcnta by \@tempcntb + \advance\@tempcnta by -9999 + \ifnum\@tempcnta>0 + \def\@tempa{1.\the\@tempcnta}% + \else + \def\@tempa{1}% + \fi + \LettrineFontHook + \fontsize{\@tempa\L@height}{\@tempa\L@height}% + \selectfont +} +\newcommand*{\LettrineFontEPS}{% + \Lettrine@height\LettrineFontHook + \includegraphics[height=\L@height]% +} +\define@key{L}{lines}{\setcounter{L@lines}{#1}} +\define@key{L}{depth}{\setcounter{L@depth}{#1}} +\define@key{L}{lhang}{\renewcommand*{\L@hang}{#1}} +\define@key{L}{loversize}{\renewcommand*{\L@oversize}{#1}} +\define@key{L}{lraise}{\renewcommand*{\L@raise}{#1}} +\define@key{L}{ante}{\renewcommand*{\L@ante}{#1}} +\define@key{L}{findent}{\setlength{\L@Findent}{#1}} +\define@key{L}{nindent}{\setlength{\L@Nindent}{#1}} +\define@key{L}{slope}{\setlength{\L@slope}{#1}} +\define@key{L}{image}[true]{\csname L@image#1\endcsname} +\define@key{L}{grid}[true]{\csname L@grid#1\endcsname} +\define@key{L}{realheight}[true]{\csname L@realh#1\endcsname} +\define@key{L}{novskip}{\setlength{\L@novskip}{#1}} +\newcommand*{\LettrineOptionsFor}[2]{\@namedef{l@#1-keys}{#2}} +\newdimen\LettrineWidth +\newdimen\LettrineHeight +\newdimen\LettrineDepth +\def\lettrine{\@ifnextchar[\@lettrine{\@lettrine[]}} +\def\@lettrine[#1]#2#3{% + \setcounter{L@lines}{\value{DefaultLines}}% + \setcounter{L@depth}{\value{DefaultDepth}}% + \renewcommand*{\L@hang}{\DefaultLhang}% + \renewcommand*{\L@oversize}{\DefaultLoversize}% + \renewcommand*{\L@raise}{\DefaultLraise}% + \renewcommand*{\L@ante}{}% + \setlength{\L@Findent}{\DefaultFindent}% + \setlength{\L@Nindent}{\DefaultNindent}% + \setlength{\L@slope}{\DefaultSlope}% + \setlength{\L@novskip}{\DiscardVskip}% + \ifLettrineImage\L@imagetrue\else\L@imagefalse\fi + \ifLettrineOnGrid\L@gridtrue\else\L@gridfalse\fi + \ifLettrineRealHeight\L@realhtrue\else\L@realhfalse\fi + \setkeys{L}{#1}% + \sbox{\L@tbox}{\LettrineTextFont{\LettrineSecondString}}% + \ifL@realh + \def\@tempa{#3} + \ifx\@tempa\@empty + \PackageWarning{lettrine.sty}% + {Empty second argument,\MessageBreak + ignoring option `realheight';}% + \else + \sbox{\L@tbox}{\LettrineTextFont{#3}}% + \fi + \fi + \if\DefaultOptionsFile\relax + \else + \begingroup + \InputIfFileExists{\DefaultOptionsFile}% + {}% + {\PackageWarning{lettrine.sty}% + {File \DefaultOptionsFile\space not found}% + }% + \def\color##1##{\l@color{##1}}% + \let\l@color\@gobbletwo + \def\textcolor##1##{\l@textcolor{##1}}% + \def\l@textcolor##1##2##3{##3}% + \expandafter\ifx\csname l@#2-keys\endcsname\relax + \gdef\l@LOKeys{}% + \else + \xdef\l@LOKeys{\csname l@#2-keys\endcsname}% + \fi + \endgroup + \def\KV@prefix{KV@L@}% + \let\@tempc\relax + \expandafter\KV@do\l@LOKeys,\relax, + \sbox{\L@lbox}{\LettrineFont #2}% + \setlength{\LettrineWidth}{\wd\L@lbox}% + \def\KV@prefix{KV@L@}% + \let\@tempc\relax + \expandafter\KV@do\l@LOKeys,\relax, + \setkeys{L}{#1}% + \fi + \ifL@image + \sbox{\L@lbox}{\LettrineFontEPS{#2}}% + \else + \sbox{\L@lbox}{\LettrineFont #2}% + \fi + \sbox{\L@tbox}{\LettrineTextFont{#3}}% + \@tempdima=\baselineskip + \ifnum\value{L@lines}=1 + \setlength{\L@first}{\ht\L@lbox}% + \addtolength{\L@first}{-\ht\L@tbox}% + \setlength{\L@lraise}{\z@}% + \else + \setlength{\L@first}{-\value{L@lines}\@tempdima}% + \addtolength{\L@first}{\@tempdima}% + \sbox{\@tempboxa}{\LettrineTextFont x}% + \addtolength{\L@first}{-\ht\@tempboxa}% + \setlength{\L@lraise}{-\L@raise\L@first}% + \addtolength{\L@first}{\L@lraise}% + \addtolength{\L@first}{\ht\L@lbox}% + \addtolength{\L@lraise}{-\value{L@lines}\@tempdima}% + \addtolength{\L@lraise}{\@tempdima}% + \fi + \par + \ifdim\L@first>\L@novskip + \ifL@grid + \@tempdima=\baselineskip + \@tempdimb=\@tempdima + \advance\@tempdimb by \L@novskip + \@tempcnta=1 + \loop\ifdim\L@first>\@tempdimb + \advance\@tempcnta by 1 + \advance\L@first by -\@tempdima + \repeat + \vskip\@tempcnta\baselineskip + \else + \vskip\L@first + \fi + \fi + \setlength{\L@Pindent}{\wd\L@lbox}% + \addtolength{\L@Pindent}{-\L@hang\wd\L@lbox}% + \settowidth{\L@first}{\L@ante}% + \addtolength{\L@Pindent}{\L@first}% + \addtolength{\L@Pindent}{\L@Findent}% + \setlength{\L@first}{\linewidth}% + \addtolength{\L@first}{-\L@Pindent}% + \addtolength{\L@Nindent}{\L@Pindent}% + \setlength{\L@next}{\linewidth}% + \addtolength{\L@next}{-\L@Nindent}% + \addtolength{\L@Pindent}{\rightmargin}% + \addtolength{\L@Nindent}{\rightmargin}% + \setlength{\LettrineWidth}{\wd\L@lbox}% + \setlength{\LettrineHeight}{\ht\L@lbox}% + \setlength{\LettrineDepth}{\dp\L@lbox}% + \addtocounter{L@lines}{1}% + \addtocounter{L@lines}{\value{L@depth}}% + \def\L@parshape{\c@L@lines \the\L@Pindent \the\L@first}% + \@tempcnta=\tw@ + \@whilenum \@tempcnta<\c@L@lines\do{% + \edef\L@parshape{\L@parshape \the\L@Nindent \the\L@next}% + \addtolength{\L@Nindent}{\L@slope}% + \addtolength{\L@next}{-\L@slope}% + \advance\@tempcnta\@ne}% + \edef\L@parshape{\L@parshape \rightmargin \the\linewidth}% + \noindent + \parshape=\L@parshape\relax + \smash{\llap{\mbox{\L@ante}\raisebox{\L@lraise}{\usebox{\L@lbox}}% + \hskip \the\L@Findent}}% + \usebox{\L@tbox}% +} +\InputIfFileExists{lettrine.cfg} + {\typeout{Loading lettrine.cfg}} + {\typeout{lettrine.cfg not found, using default values}} +\endinput +%% +%% End of file `lettrine.sty'. diff --git a/Master/texmf-dist/tex/latex/lettrine/lettrine-2018-08-18.sty b/Master/texmf-dist/tex/latex/lettrine/lettrine-2018-08-18.sty new file mode 100644 index 00000000000..1d2d6e74dd1 --- /dev/null +++ b/Master/texmf-dist/tex/latex/lettrine/lettrine-2018-08-18.sty @@ -0,0 +1,278 @@ +%% +%% This is file `lettrine.sty' v2.1. +%% +%% IMPORTANT NOTICE: +%% +%% For the copyright see the source file `lettrine.dtx'. +%% +%% Any modified versions of this file must be renamed +%% with new filenames distinct from lettrine.sty. +%% +%% For distribution of the original source see the terms +%% for copying and modification in the file lettrine.dtx. +%% +%% This generated file may be distributed as long as the +%% original source files, as listed above, are part of the +%% same distribution. (The sources need not necessarily be +%% in the same archive or directory.) +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\ProvidesFile{lettrine.sty} + [2018/08/18 v2.1 (Daniel Flipo)] +\NeedsTeXFormat{LaTeX2e}[1999/12/01] +\RequirePackage{keyval,minifp} +\newcounter{DefaultLines} +\setcounter{DefaultLines}{2} +\newcounter{DefaultDepth} +\newcommand*{\DefaultOptionsFile}{\relax} +\newcommand*{\DefaultLoversize}{0} +\newcommand*{\DefaultLraise}{0} +\newcommand*{\DefaultLhang}{0} +\newdimen\DefaultFindent +\setlength{\DefaultFindent}{\z@} +\newdimen\DefaultNindent +\setlength{\DefaultNindent}{0.5em} +\newdimen\DefaultSlope +\setlength{\DefaultSlope}{\z@} +\newdimen\DiscardVskip +\setlength{\DiscardVskip}{0.2\p@} +\newif\ifLettrineImage +\newif\ifLettrineOnGrid +\newif\ifLettrineRealHeight +\newif\ifLettrineVone +\newif\ifLettrineSelfRef +\newsavebox{\L@lbox} +\newsavebox{\L@tbox} +\newcounter{L@lines} +\newcounter{L@depth} +\newdimen\L@Pindent +\newdimen\L@Findent +\newdimen\L@Nindent +\newdimen\L@lraise +\newdimen\L@first +\newdimen\L@next +\newdimen\L@slope +\newdimen\L@height +\newdimen\L@novskip +\newdimen\L@target@ht +\newdimen\L@target@dp +\newdimen\L@target@tht +\newdimen\LettrineWidth +\newdimen\LettrineHeight +\newdimen\LettrineDepth +\newcommand*{\L@file}{} +\newcommand*{\L@hang}{} +\newcommand*{\L@oversize}{} +\newcommand*{\L@raise}{} +\newcommand*{\L@ante}{} +\newif\ifL@image +\newif\ifL@grid +\newif\ifL@realh +\newif\ifL@vone +\newif\ifL@selfref +\newcommand*{\LettrineTextFont}{\scshape} +\newcommand*{\LettrineTestString}{EFTZ} +\newcommand*{\LettrineSecondString}{x} +\def\Lettrine@height{% + \setlength{\L@target@ht}{\ht\L@tbox}% + \@tempdima=\baselineskip + \setlength{\L@target@dp}{\value{L@lines}\@tempdima}% + \ifnum\value{L@lines}>1 + \addtolength{\L@target@dp}{-\@tempdima}% + \else + \addtolength{\L@target@ht}{\L@target@dp}% + \setlength{\L@target@dp}{0pt}% + \fi + \setlength{\L@target@tht}{\L@target@ht}% + \addtolength{\L@target@tht}{\L@target@dp}% + \setlength{\L@height}{\L@target@tht}% + \addtolength{\L@height}{\L@oversize\L@target@tht}% + \ifL@image + \else + \ifL@selfref + \def\Lettrine@RefString{\l@refstring}% + \else + \def\Lettrine@RefString{\LettrineTestString}% + \fi + \sbox{\@tempboxa}{\LettrineFontHook + \fontsize{\L@height}{\L@height}\selectfont + \Lettrine@RefString}% + \@tempcnta=\ht\@tempboxa + \@tempcntb=\L@height + \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 + \fi +} +\newcommand*{\LettrineFontHook}{} +\newcommand*{\LettrineFont}{% + \LettrineFontHook + \fontsize{\L@factor\L@height}{\L@factor\L@height}% + \selectfont +} +\newcommand*{\LettrineFontEPS}{% + \LettrineFontHook\includegraphics[height=\L@height]% +} +\define@key{L}{lines}{\setcounter{L@lines}{#1}} +\define@key{L}{depth}{\setcounter{L@depth}{#1}} +\define@key{L}{lhang}{\renewcommand*{\L@hang}{#1}} +\define@key{L}{loversize}{\renewcommand*{\L@oversize}{#1}} +\define@key{L}{lraise}{\renewcommand*{\L@raise}{#1}} +\define@key{L}{ante}{\renewcommand*{\L@ante}{#1}} +\define@key{L}{findent}{\setlength{\L@Findent}{#1}} +\define@key{L}{nindent}{\setlength{\L@Nindent}{#1}} +\define@key{L}{slope}{\setlength{\L@slope}{#1}} +\define@key{L}{image}[true]{\csname L@image#1\endcsname} +\define@key{L}{grid}[true]{\csname L@grid#1\endcsname} +\define@key{L}{realheight}[true]{\csname L@realh#1\endcsname} +\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} +\newcommand*{\LettrineOptionsFor}[2]{\@namedef{l@#1-keys}{#2}} +\def\lettrine{\@ifnextchar[\@lettrine{\@lettrine[]}} +\def\@lettrine[#1]#2#3{% + \def\l@initial{#2}\let\l@refstring\l@initial + \setcounter{L@lines}{\value{DefaultLines}}% + \setcounter{L@depth}{\value{DefaultDepth}}% + \renewcommand*{\L@hang}{\DefaultLhang}% + \renewcommand*{\L@oversize}{\DefaultLoversize}% + \renewcommand*{\L@raise}{\DefaultLraise}% + \renewcommand*{\L@ante}{}% + \setlength{\L@Findent}{\DefaultFindent}% + \setlength{\L@Nindent}{\DefaultNindent}% + \setlength{\L@slope}{\DefaultSlope}% + \setlength{\L@novskip}{\DiscardVskip}% + \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 + \setkeys{L}{#1}% + \sbox{\L@tbox}{\LettrineTextFont{\LettrineSecondString}}% + \ifL@realh + \def\@tempa{#3} + \ifx\@tempa\@empty + \PackageWarning{lettrine.sty}% + {Empty second argument,\MessageBreak + ignoring option `realheight';}% + \else + \sbox{\L@tbox}{\LettrineTextFont{#3}}% + \fi + \fi + \if\DefaultOptionsFile\relax + \else + \begingroup + \InputIfFileExists{\DefaultOptionsFile}% + {}% + {\PackageWarning{lettrine.sty}% + {File \DefaultOptionsFile\space not found}% + }% + \def\color##1##{\l@color{##1}}% + \let\l@color\@gobbletwo + \def\textcolor##1##{\l@textcolor{##1}}% + \def\l@textcolor##1##2##3{##3}% + \expandafter\ifx\csname l@#2-keys\endcsname\relax + \gdef\l@LOKeys{}% + \else + \xdef\l@LOKeys{\csname l@#2-keys\endcsname}% + \fi + \endgroup + \def\KV@prefix{KV@L@}% + \let\@tempc\relax + \expandafter\KV@do\l@LOKeys,\relax, + \Lettrine@height + \sbox{\L@lbox}{\LettrineFont #2}% + \setlength{\LettrineWidth}{\wd\L@lbox}% + \def\KV@prefix{KV@L@}% + \let\@tempc\relax + \expandafter\KV@do\l@LOKeys,\relax, + \setkeys{L}{#1}% + \fi + \Lettrine@height + \ifL@image + \sbox{\L@lbox}{\LettrineFontEPS{#2}}% + \else + \sbox{\L@lbox}{\LettrineFont #2}% + \fi + \setlength{\LettrineWidth}{\wd\L@lbox}% + \setlength{\LettrineHeight}{\ht\L@lbox}% + \setlength{\LettrineDepth}{\dp\L@lbox}% + \begingroup + \def\IeC##1{##1}% + \@tempdima=\L@oversize pt\relax + \PackageInfo{lettrine.sty}% + {Targeted height = \the\L@target@tht\MessageBreak + (no accent, loversize=0),\MessageBreak + Lettrine height = \the\LettrineHeight\space (#2)% + \ifdim\@tempdima=\z@\else\space loversize=\L@oversize\fi;% + \MessageBreak reported}% + \endgroup + \sbox{\L@tbox}{\LettrineTextFont{#3}}% + \setlength{\L@first}{\LettrineHeight}% + \setlength{\L@lraise}{\L@raise\L@target@tht}% + \addtolength{\L@first}{\L@lraise}% + \ifnum\value{L@lines}=1 + \addtolength{\L@first}{-\ht\L@tbox}% + \else + \addtolength{\L@first}{-\L@target@tht}% + \addtolength{\L@lraise}{-\L@target@dp}% + \fi + \par + \ifdim\L@first>\L@novskip + \ifL@grid + \@tempdima=\baselineskip + \@tempdimb=\@tempdima + \advance\@tempdimb by \L@novskip + \@tempcnta=1 + \loop\ifdim\L@first>\@tempdimb + \advance\@tempcnta by 1 + \advance\L@first by -\@tempdima + \repeat + \L@first=\@tempcnta\baselineskip + \fi + \vskip\L@first + \fi + \setlength{\L@Pindent}{\wd\L@lbox}% + \addtolength{\L@Pindent}{-\L@hang\wd\L@lbox}% + \settowidth{\L@first}{\L@ante}% + \addtolength{\L@Pindent}{\L@first}% + \addtolength{\L@Pindent}{\L@Findent}% + \setlength{\L@first}{\linewidth}% + \addtolength{\L@first}{-\L@Pindent}% + \addtolength{\L@Nindent}{\L@Pindent}% + \setlength{\L@next}{\linewidth}% + \addtolength{\L@next}{-\L@Nindent}% + \addtolength{\L@Pindent}{\rightmargin}% + \addtolength{\L@Nindent}{\rightmargin}% + \addtocounter{L@lines}{1}% + \addtocounter{L@lines}{\value{L@depth}}% + \def\L@parshape{\c@L@lines \the\L@Pindent \the\L@first}% + \@tempcnta=\tw@ + \@whilenum \@tempcnta<\c@L@lines\do{% + \edef\L@parshape{\L@parshape \the\L@Nindent \the\L@next}% + \addtolength{\L@Nindent}{\L@slope}% + \addtolength{\L@next}{-\L@slope}% + \advance\@tempcnta\@ne}% + \edef\L@parshape{\L@parshape \rightmargin \the\linewidth}% + \noindent + \parshape=\L@parshape\relax + \smash{\llap{\mbox{\L@ante}\raisebox{\L@lraise}{\usebox{\L@lbox}}% + \hskip \the\L@Findent}}% + \usebox{\L@tbox}% +} +\InputIfFileExists{lettrine.cfg} + {\typeout{Loading lettrine.cfg}} + {\typeout{lettrine.cfg not found, using default values}} +\endinput +%% +%% End of file `lettrine.sty'. diff --git a/Master/texmf-dist/tex/latex/lettrine/lettrine.cfg b/Master/texmf-dist/tex/latex/lettrine/lettrine.cfg index 3af13c9caa7..d38f7bf6bbf 100644 --- a/Master/texmf-dist/tex/latex/lettrine/lettrine.cfg +++ b/Master/texmf-dist/tex/latex/lettrine/lettrine.cfg @@ -26,15 +26,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/tex/latex/lettrine/lettrine.sty b/Master/texmf-dist/tex/latex/lettrine/lettrine.sty index cd6ce420159..36588a71988 100644 --- a/Master/texmf-dist/tex/latex/lettrine/lettrine.sty +++ b/Master/texmf-dist/tex/latex/lettrine/lettrine.sty @@ -6,24 +6,40 @@ %% %% lettrine.dtx (with options: `sty') %% -%% IMPORTANT NOTICE: +%% This file is a generated file part of the lettrine package. +%% ----------------------------------------------------------- %% -%% For the copyright see the source file. +%% For the copyright see the source file lettine.dtx. %% -%% Any modified versions of this file must be renamed -%% with new filenames distinct from lettrine.sty. +%% 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. %% -%% For distribution of the original source see the terms -%% for copying and modification in the file lettrine.dtx. +%% This work has the LPPL maintenance status "maintained". %% -%% This generated file may be distributed as long as the -%% original source files, as listed above, are part of the -%% same distribution. (The sources need not necessarily be -%% in the same archive or directory.) -\NeedsTeXFormat{LaTeX2e}[1999/12/01] +%% The Current Maintainer of this work is Daniel Flipo. +%% +%% Please report errors to: +%% +\NeedsTeXFormat{LaTeX2e}[2018-04-01] \ProvidesFile{lettrine.sty} - [2018/08/18 v2.1 (Daniel Flipo)] -\NeedsTeXFormat{LaTeX2e}[1999/12/01] + [2018-08-25 v2.2 (Daniel Flipo)] +\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 \RequirePackage{keyval,minifp} \newcounter{DefaultLines} \setcounter{DefaultLines}{2} @@ -43,7 +59,6 @@ \newif\ifLettrineImage \newif\ifLettrineOnGrid \newif\ifLettrineRealHeight -\newif\ifLettrineVone \newif\ifLettrineSelfRef \newsavebox{\L@lbox} \newsavebox{\L@tbox} @@ -72,7 +87,6 @@ \newif\ifL@image \newif\ifL@grid \newif\ifL@realh -\newif\ifL@vone \newif\ifL@selfref \newcommand*{\LettrineTextFont}{\scshape} \newcommand*{\LettrineTestString}{EFTZ} @@ -103,19 +117,7 @@ \Lettrine@RefString}% \@tempcnta=\ht\@tempboxa \@tempcntb=\L@height - \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 } \newcommand*{\LettrineFontHook}{} @@ -142,7 +144,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} \newcommand*{\LettrineOptionsFor}[2]{\@namedef{l@#1-keys}{#2}} \def\lettrine{\@ifnextchar[\@lettrine{\@lettrine[]}} \def\@lettrine[#1]#2#3{% @@ -160,7 +161,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 \setkeys{L}{#1}% \sbox{\L@tbox}{\LettrineTextFont{\LettrineSecondString}}% -- cgit v1.2.3