texlive[48492] Master/texmf-dist: lettrine (26aug18)
commits+karl at tug.org
commits+karl at tug.org
Sun Aug 26 23:26:44 CEST 2018
Revision: 48492
http://tug.org/svn/texlive?view=revision&revision=48492
Author: karl
Date: 2018-08-26 23:26:43 +0200 (Sun, 26 Aug 2018)
Log Message:
-----------
lettrine (26aug18)
Modified Paths:
--------------
trunk/Master/texmf-dist/doc/latex/lettrine/README
trunk/Master/texmf-dist/doc/latex/lettrine/demo-de.pdf
trunk/Master/texmf-dist/doc/latex/lettrine/demo.pdf
trunk/Master/texmf-dist/doc/latex/lettrine/demo.tex
trunk/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf
trunk/Master/texmf-dist/source/latex/lettrine/lettrine.dtx
trunk/Master/texmf-dist/source/latex/lettrine/lettrine.ins
trunk/Master/texmf-dist/tex/latex/lettrine/lettrine.cfg
trunk/Master/texmf-dist/tex/latex/lettrine/lettrine.sty
Added Paths:
-----------
trunk/Master/texmf-dist/tex/latex/lettrine/lettrine-2006-03-17.sty
trunk/Master/texmf-dist/tex/latex/lettrine/lettrine-2015-08-31.sty
trunk/Master/texmf-dist/tex/latex/lettrine/lettrine-2018-08-18.sty
Modified: trunk/Master/texmf-dist/doc/latex/lettrine/README
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lettrine/README 2018-08-26 21:26:31 UTC (rev 48491)
+++ trunk/Master/texmf-dist/doc/latex/lettrine/README 2018-08-26 21:26:43 UTC (rev 48492)
@@ -13,8 +13,8 @@
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 @@
--
Daniel Flipo, <daniel.flipo at free.fr>
-July, 21th, 2018.
+August, 25th, 2018.
Modified: trunk/Master/texmf-dist/doc/latex/lettrine/demo-de.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/lettrine/demo.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/doc/latex/lettrine/demo.tex
===================================================================
--- trunk/Master/texmf-dist/doc/latex/lettrine/demo.tex 2018-08-26 21:26:31 UTC (rev 48491)
+++ trunk/Master/texmf-dist/doc/latex/lettrine/demo.tex 2018-08-26 21:26:43 UTC (rev 48492)
@@ -227,19 +227,6 @@
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}
Modified: trunk/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf
===================================================================
(Binary files differ)
Modified: trunk/Master/texmf-dist/source/latex/lettrine/lettrine.dtx
===================================================================
--- trunk/Master/texmf-dist/source/latex/lettrine/lettrine.dtx 2018-08-26 21:26:31 UTC (rev 48491)
+++ trunk/Master/texmf-dist/source/latex/lettrine/lettrine.dtx 2018-08-26 21:26:43 UTC (rev 48492)
@@ -1,5 +1,5 @@
%
-% \CheckSum{636}
+% \CheckSum{609}
%
% \iffalse meta-comment
%
@@ -20,7 +20,7 @@
% \iffalse
%
%<*sty>
-\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\NeedsTeXFormat{LaTeX2e}[2018-04-01]
\ProvidesFile{lettrine.sty}
%</sty>
%<*dtx>
@@ -27,7 +27,7 @@
\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,10 +371,19 @@
% 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{}
@@ -383,13 +390,36 @@
%
% \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}
-\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\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}
\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 at image
\newif\ifL at grid
\newif\ifL at realh
-\newif\ifL at vone
\newif\ifL at selfref
% \end{macrocode}
%
@@ -625,22 +653,9 @@
% Up to v2.01, possible values for |\L at 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 at 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 at vone
- \multiply\@tempcntb by 100
- \divide\@tempcnta by 100
- \divide\@tempcntb by \@tempcnta
- \advance\@tempcntb by -9999
- \ifnum\@tempcntb>0
- \def\L at factor{1.\the\@tempcntb}%
- \else
- \def\L at factor{1}%
- \fi
- \else
- \MFPdiv{\the\@tempcntb}{\the\@tempcnta}\L at factor
- \fi
+ \MFPdiv{\the\@tempcntb}{\the\@tempcnta}\L at factor
\fi
}
% \end{macrocode}
@@ -700,7 +715,6 @@
\define at key{L}{novskip}{\setlength{\L at novskip}{#1}}
\define at key{L}{refstring}[\l at initial]{\L at selfreftrue
\def\l at refstring{#1}}
-\define at key{L}{Vone}[true]{\csname L at vone#1\endcsname}
% \end{macrocode}
%
% \changes{v1.5}{2003/08/18}{\cs{LettrineOptionsFor} and
@@ -749,7 +763,6 @@
\ifLettrineImage\L at imagetrue\else\L at imagefalse\fi
\ifLettrineOnGrid\L at gridtrue\else\L at gridfalse\fi
\ifLettrineRealHeight\L at realhtrue\else\L at realhfalse\fi
- \ifLettrineVone\L at vonetrue\else\L at vonefalse\fi
\ifLettrineSelfRef\L at selfreftrue\else\L at 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'
Modified: trunk/Master/texmf-dist/source/latex/lettrine/lettrine.ins
===================================================================
--- trunk/Master/texmf-dist/source/latex/lettrine/lettrine.ins 2018-08-26 21:26:31 UTC (rev 48491)
+++ trunk/Master/texmf-dist/source/latex/lettrine/lettrine.ins 2018-08-26 21:26:43 UTC (rev 48492)
@@ -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}}
Added: trunk/Master/texmf-dist/tex/latex/lettrine/lettrine-2006-03-17.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lettrine/lettrine-2006-03-17.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lettrine/lettrine-2006-03-17.sty 2018-08-26 21:26:43 UTC (rev 48492)
@@ -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 at lbox}
+\newsavebox{\L at tbox}
+\newcounter{L at lines}
+\newdimen\L at Pindent
+\newdimen\L at Findent
+\newdimen\L at Nindent
+\newdimen\L at lraise
+\newdimen\L at first
+\newdimen\L at next
+\newdimen\L at slope
+\newdimen\L at height
+\newcommand*{\L at file}{}
+\newcommand*{\L at hang}{}
+\newcommand*{\L at oversize}{}
+\newcommand*{\L at raise}{}
+\newcommand*{\L at ante}{}
+\newif\ifL at image
+\newcommand*{\LettrineTextFont}{\scshape}
+\def\Lettrine at height{%
+ \@tempdima=\baselineskip
+ \setlength{\L at height}{\theL at lines\@tempdima}%
+ \ifnum\theL at lines>1
+ \addtolength{\L at height}{-\@tempdima}%
+ \fi
+ \sbox{\L at tbox}{\LettrineTextFont x}%
+ \addtolength{\L at height}{\ht\L at tbox}%
+ \addtolength{\L at height}{\L at oversize\L at height}}
+\newcommand*{\LettrineFontHook}{}
+\newcommand*{\LettrineTestString}{X}
+\newcommand*{\LettrineFont}{%
+ \Lettrine at height
+ \sbox{\L at tbox}{\LettrineFontHook\fontsize{\L at height}{\L at height}%
+ \selectfont \LettrineTestString}%
+ \@tempcntb=\ht\L at tbox
+ \@tempcnta=\L at 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 at height}{\@tempa\L at height}%
+ \selectfont
+}
+\newcommand*{\LettrineFontEPS}{%
+ \Lettrine at height\LettrineFontHook
+ \includegraphics[height=\L at height]}
+\define at key{L}{lines}{\setcounter{L at lines}{#1}}
+\define at key{L}{lhang}{\renewcommand*{\L at hang}{#1}}
+\define at key{L}{loversize}{\renewcommand*{\L at oversize}{#1}}
+\define at key{L}{lraise}{\renewcommand*{\L at raise}{#1}}
+\define at key{L}{ante}{\renewcommand*{\L at ante}{#1}}
+\define at key{L}{findent}{\setlength{\L at Findent}{#1}}
+\define at key{L}{nindent}{\setlength{\L at Nindent}{#1}}
+\define at key{L}{slope}{\setlength{\L at slope}{#1}}
+\define at key{L}{image}[true]{\csname L at 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 at lines}{\theDefaultLines}%
+ \renewcommand*{\L at hang}{\DefaultLhang}%
+ \renewcommand*{\L at oversize}{\DefaultLoversize}%
+ \renewcommand*{\L at raise}{\DefaultLraise}%
+ \renewcommand*{\L at ante}{}%
+ \setlength{\L at Findent}{\DefaultFindent}%
+ \setlength{\L at Nindent}{\DefaultNindent}%
+ \setlength{\L at slope}{\DefaultSlope}%
+ \ifLettrineImage\L at imagetrue\else\L at imagefalse\fi
+ \if\DefaultOptionsFile\relax
+ \else
+ \begingroup
+ \InputIfFileExists{\DefaultOptionsFile}%
+ {}%
+ {\PackageWarning{lettrine.sty}%
+ {File \DefaultOptionsFile\space not found}%
+ }%
+ \def\color##1##{\l at color{##1}}%
+ \let\l at color\@gobbletwo
+ \def\textcolor##1##{\l at textcolor{##1}}%
+ \def\l at textcolor##1##2##3{##3}%
+ \expandafter\ifx\csname l@#2-keys\endcsname\relax
+ \gdef\l at LOKeys{}%
+ \else
+ \xdef\l at LOKeys{\csname l@#2-keys\endcsname}%
+ \fi
+ \endgroup
+ \def\KV at prefix{KV at L@}%
+ \let\@tempc\relax
+ \expandafter\KV at do\l at LOKeys,\relax,
+ \sbox{\L at lbox}{\LettrineFont #2}%
+ \setlength{\LettrineWidth}{\wd\L at lbox}%
+ \def\KV at prefix{KV at L@}%
+ \let\@tempc\relax
+ \expandafter\KV at do\l at LOKeys,\relax,
+ \fi
+ \setkeys{L}{#1}%
+ \ifL at image
+ \sbox{\L at lbox}{\LettrineFontEPS{#2}}%
+ \else
+ \sbox{\L at lbox}{\LettrineFont #2}%
+ \fi
+ \sbox{\L at tbox}{\LettrineTextFont{#3}}%
+ \@tempdima=\baselineskip
+ \ifnum\theL at lines=1
+ \setlength{\L at first}{\ht\L at lbox}%
+ \addtolength{\L at first}{-\ht\L at tbox}%
+ \setlength{\L at lraise}{\z@}%
+ \else
+ \setlength{\L at first}{-\theL at lines\@tempdima}%
+ \addtolength{\L at first}{\@tempdima}%
+ \sbox{\@tempboxa}{\LettrineTextFont x}%
+ \addtolength{\L at first}{-\ht\@tempboxa}%
+ \setlength{\L at lraise}{-\L at raise\L at first}%
+ \addtolength{\L at first}{\L at lraise}%
+ \addtolength{\L at first}{\ht\L at lbox}%
+ \addtolength{\L at lraise}{-\theL at lines\@tempdima}%
+ \addtolength{\L at lraise}{\@tempdima}%
+ \fi
+ \par
+ \ifdim\L at first>0.2\p@\vskip\L at first\fi
+ \setlength{\L at Pindent}{\wd\L at lbox}%
+ \addtolength{\L at Pindent}{-\L at hang\wd\L at lbox}%
+ \settowidth{\L at first}{\L at ante}%
+ \addtolength{\L at Pindent}{\L at first}%
+ \addtolength{\L at Pindent}{\L at Findent}%
+ \setlength{\L at first}{\linewidth}%
+ \addtolength{\L at first}{-\L at Pindent}%
+ \addtolength{\L at Nindent}{\L at Pindent}%
+ \setlength{\L at next}{\linewidth}%
+ \addtolength{\L at next}{-\L at Nindent}%
+ \addtolength{\L at Pindent}{\rightmargin}%
+ \addtolength{\L at Nindent}{\rightmargin}%
+ \setlength{\LettrineWidth}{\wd\L at lbox}%
+ \setlength{\LettrineHeight}{\ht\L at lbox}%
+ \setlength{\LettrineDepth}{\dp\L at lbox}%
+ \addtocounter{L at lines}{1}%
+ \def\L at parshape{\c at L@lines \the\L at Pindent \the\L at first}%
+ \@tempcnta=\tw@
+ \@whilenum \@tempcnta<\c at L@lines\do{%
+ \edef\L at parshape{\L at parshape \the\L at Nindent \the\L at next}%
+ \addtolength{\L at Nindent}{\L at slope}%
+ \addtolength{\L at next}{-\L at slope}%
+ \advance\@tempcnta\@ne}%
+ \edef\L at parshape{\L at parshape \rightmargin \the\linewidth}%
+ \noindent
+ \parshape=\L at parshape\relax
+ \smash{\llap{\mbox{\L at ante}\raisebox{\L at lraise}{\usebox{\L at lbox}}%
+ \hskip \the\L at Findent}}%
+ \usebox{\L at tbox}%
+}
+\InputIfFileExists{lettrine.cfg}
+ {\typeout{Loading lettrine.cfg}}
+ {\typeout{lettrine.cfg not found, using default values}}
+\endinput
+%%
+%% End of file `lettrine.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lettrine/lettrine-2006-03-17.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/lettrine/lettrine-2015-08-31.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lettrine/lettrine-2015-08-31.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lettrine/lettrine-2015-08-31.sty 2018-08-26 21:26:43 UTC (rev 48492)
@@ -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 at lbox}
+\newsavebox{\L at tbox}
+\newcounter{L at lines}
+\newcounter{L at depth}
+\newdimen\L at Pindent
+\newdimen\L at Findent
+\newdimen\L at Nindent
+\newdimen\L at lraise
+\newdimen\L at first
+\newdimen\L at next
+\newdimen\L at slope
+\newdimen\L at height
+\newdimen\L at novskip
+\newcommand*{\L at file}{}
+\newcommand*{\L at hang}{}
+\newcommand*{\L at oversize}{}
+\newcommand*{\L at raise}{}
+\newcommand*{\L at ante}{}
+\newif\ifL at image
+\newif\ifL at grid
+\newif\ifL at realh
+\newcommand*{\LettrineTextFont}{\scshape}
+\def\Lettrine at height{%
+ \@tempdima=\baselineskip
+ \setlength{\L at height}{\value{L at lines}\@tempdima}%
+ \ifnum\value{L at lines}>1
+ \addtolength{\L at height}{-\@tempdima}%
+ \fi
+ \ifvoid\L at tbox
+ \sbox{\L at tbox}{\LettrineTextFont{\LettrineSecondString}}%
+ \fi
+ \addtolength{\L at height}{\ht\L at tbox}%
+ \addtolength{\L at height}{\L at oversize\L at height}%
+}
+\newcommand*{\LettrineFontHook}{}
+\newcommand*{\LettrineTestString}{ABCDEFGHIJKLMNOQPRSTUVWXYZ}
+\newcommand*{\LettrineSecondString}{x}
+\newcommand*{\LettrineFont}{%
+ \Lettrine at height
+ \sbox{\@tempboxa}{\LettrineFontHook\fontsize{\L at height}{\L at height}%
+ \selectfont \LettrineTestString}%
+ \@tempcntb=\ht\@tempboxa
+ \@tempcnta=\L at 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 at height}{\@tempa\L at height}%
+ \selectfont
+}
+\newcommand*{\LettrineFontEPS}{%
+ \Lettrine at height\LettrineFontHook
+ \includegraphics[height=\L at height]%
+}
+\define at key{L}{lines}{\setcounter{L at lines}{#1}}
+\define at key{L}{depth}{\setcounter{L at depth}{#1}}
+\define at key{L}{lhang}{\renewcommand*{\L at hang}{#1}}
+\define at key{L}{loversize}{\renewcommand*{\L at oversize}{#1}}
+\define at key{L}{lraise}{\renewcommand*{\L at raise}{#1}}
+\define at key{L}{ante}{\renewcommand*{\L at ante}{#1}}
+\define at key{L}{findent}{\setlength{\L at Findent}{#1}}
+\define at key{L}{nindent}{\setlength{\L at Nindent}{#1}}
+\define at key{L}{slope}{\setlength{\L at slope}{#1}}
+\define at key{L}{image}[true]{\csname L at image#1\endcsname}
+\define at key{L}{grid}[true]{\csname L at grid#1\endcsname}
+\define at key{L}{realheight}[true]{\csname L at realh#1\endcsname}
+\define at key{L}{novskip}{\setlength{\L at 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 at lines}{\value{DefaultLines}}%
+ \setcounter{L at depth}{\value{DefaultDepth}}%
+ \renewcommand*{\L at hang}{\DefaultLhang}%
+ \renewcommand*{\L at oversize}{\DefaultLoversize}%
+ \renewcommand*{\L at raise}{\DefaultLraise}%
+ \renewcommand*{\L at ante}{}%
+ \setlength{\L at Findent}{\DefaultFindent}%
+ \setlength{\L at Nindent}{\DefaultNindent}%
+ \setlength{\L at slope}{\DefaultSlope}%
+ \setlength{\L at novskip}{\DiscardVskip}%
+ \ifLettrineImage\L at imagetrue\else\L at imagefalse\fi
+ \ifLettrineOnGrid\L at gridtrue\else\L at gridfalse\fi
+ \ifLettrineRealHeight\L at realhtrue\else\L at realhfalse\fi
+ \setkeys{L}{#1}%
+ \sbox{\L at tbox}{\LettrineTextFont{\LettrineSecondString}}%
+ \ifL at realh
+ \def\@tempa{#3}
+ \ifx\@tempa\@empty
+ \PackageWarning{lettrine.sty}%
+ {Empty second argument,\MessageBreak
+ ignoring option `realheight';}%
+ \else
+ \sbox{\L at tbox}{\LettrineTextFont{#3}}%
+ \fi
+ \fi
+ \if\DefaultOptionsFile\relax
+ \else
+ \begingroup
+ \InputIfFileExists{\DefaultOptionsFile}%
+ {}%
+ {\PackageWarning{lettrine.sty}%
+ {File \DefaultOptionsFile\space not found}%
+ }%
+ \def\color##1##{\l at color{##1}}%
+ \let\l at color\@gobbletwo
+ \def\textcolor##1##{\l at textcolor{##1}}%
+ \def\l at textcolor##1##2##3{##3}%
+ \expandafter\ifx\csname l@#2-keys\endcsname\relax
+ \gdef\l at LOKeys{}%
+ \else
+ \xdef\l at LOKeys{\csname l@#2-keys\endcsname}%
+ \fi
+ \endgroup
+ \def\KV at prefix{KV at L@}%
+ \let\@tempc\relax
+ \expandafter\KV at do\l at LOKeys,\relax,
+ \sbox{\L at lbox}{\LettrineFont #2}%
+ \setlength{\LettrineWidth}{\wd\L at lbox}%
+ \def\KV at prefix{KV at L@}%
+ \let\@tempc\relax
+ \expandafter\KV at do\l at LOKeys,\relax,
+ \setkeys{L}{#1}%
+ \fi
+ \ifL at image
+ \sbox{\L at lbox}{\LettrineFontEPS{#2}}%
+ \else
+ \sbox{\L at lbox}{\LettrineFont #2}%
+ \fi
+ \sbox{\L at tbox}{\LettrineTextFont{#3}}%
+ \@tempdima=\baselineskip
+ \ifnum\value{L at lines}=1
+ \setlength{\L at first}{\ht\L at lbox}%
+ \addtolength{\L at first}{-\ht\L at tbox}%
+ \setlength{\L at lraise}{\z@}%
+ \else
+ \setlength{\L at first}{-\value{L at lines}\@tempdima}%
+ \addtolength{\L at first}{\@tempdima}%
+ \sbox{\@tempboxa}{\LettrineTextFont x}%
+ \addtolength{\L at first}{-\ht\@tempboxa}%
+ \setlength{\L at lraise}{-\L at raise\L at first}%
+ \addtolength{\L at first}{\L at lraise}%
+ \addtolength{\L at first}{\ht\L at lbox}%
+ \addtolength{\L at lraise}{-\value{L at lines}\@tempdima}%
+ \addtolength{\L at lraise}{\@tempdima}%
+ \fi
+ \par
+ \ifdim\L at first>\L at novskip
+ \ifL at grid
+ \@tempdima=\baselineskip
+ \@tempdimb=\@tempdima
+ \advance\@tempdimb by \L at novskip
+ \@tempcnta=1
+ \loop\ifdim\L at first>\@tempdimb
+ \advance\@tempcnta by 1
+ \advance\L at first by -\@tempdima
+ \repeat
+ \vskip\@tempcnta\baselineskip
+ \else
+ \vskip\L at first
+ \fi
+ \fi
+ \setlength{\L at Pindent}{\wd\L at lbox}%
+ \addtolength{\L at Pindent}{-\L at hang\wd\L at lbox}%
+ \settowidth{\L at first}{\L at ante}%
+ \addtolength{\L at Pindent}{\L at first}%
+ \addtolength{\L at Pindent}{\L at Findent}%
+ \setlength{\L at first}{\linewidth}%
+ \addtolength{\L at first}{-\L at Pindent}%
+ \addtolength{\L at Nindent}{\L at Pindent}%
+ \setlength{\L at next}{\linewidth}%
+ \addtolength{\L at next}{-\L at Nindent}%
+ \addtolength{\L at Pindent}{\rightmargin}%
+ \addtolength{\L at Nindent}{\rightmargin}%
+ \setlength{\LettrineWidth}{\wd\L at lbox}%
+ \setlength{\LettrineHeight}{\ht\L at lbox}%
+ \setlength{\LettrineDepth}{\dp\L at lbox}%
+ \addtocounter{L at lines}{1}%
+ \addtocounter{L at lines}{\value{L at depth}}%
+ \def\L at parshape{\c at L@lines \the\L at Pindent \the\L at first}%
+ \@tempcnta=\tw@
+ \@whilenum \@tempcnta<\c at L@lines\do{%
+ \edef\L at parshape{\L at parshape \the\L at Nindent \the\L at next}%
+ \addtolength{\L at Nindent}{\L at slope}%
+ \addtolength{\L at next}{-\L at slope}%
+ \advance\@tempcnta\@ne}%
+ \edef\L at parshape{\L at parshape \rightmargin \the\linewidth}%
+ \noindent
+ \parshape=\L at parshape\relax
+ \smash{\llap{\mbox{\L at ante}\raisebox{\L at lraise}{\usebox{\L at lbox}}%
+ \hskip \the\L at Findent}}%
+ \usebox{\L at tbox}%
+}
+\InputIfFileExists{lettrine.cfg}
+ {\typeout{Loading lettrine.cfg}}
+ {\typeout{lettrine.cfg not found, using default values}}
+\endinput
+%%
+%% End of file `lettrine.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lettrine/lettrine-2015-08-31.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: trunk/Master/texmf-dist/tex/latex/lettrine/lettrine-2018-08-18.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lettrine/lettrine-2018-08-18.sty (rev 0)
+++ trunk/Master/texmf-dist/tex/latex/lettrine/lettrine-2018-08-18.sty 2018-08-26 21:26:43 UTC (rev 48492)
@@ -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 at lbox}
+\newsavebox{\L at tbox}
+\newcounter{L at lines}
+\newcounter{L at depth}
+\newdimen\L at Pindent
+\newdimen\L at Findent
+\newdimen\L at Nindent
+\newdimen\L at lraise
+\newdimen\L at first
+\newdimen\L at next
+\newdimen\L at slope
+\newdimen\L at height
+\newdimen\L at novskip
+\newdimen\L at target@ht
+\newdimen\L at target@dp
+\newdimen\L at target@tht
+\newdimen\LettrineWidth
+\newdimen\LettrineHeight
+\newdimen\LettrineDepth
+\newcommand*{\L at file}{}
+\newcommand*{\L at hang}{}
+\newcommand*{\L at oversize}{}
+\newcommand*{\L at raise}{}
+\newcommand*{\L at ante}{}
+\newif\ifL at image
+\newif\ifL at grid
+\newif\ifL at realh
+\newif\ifL at vone
+\newif\ifL at selfref
+\newcommand*{\LettrineTextFont}{\scshape}
+\newcommand*{\LettrineTestString}{EFTZ}
+\newcommand*{\LettrineSecondString}{x}
+\def\Lettrine at height{%
+ \setlength{\L at target@ht}{\ht\L at tbox}%
+ \@tempdima=\baselineskip
+ \setlength{\L at target@dp}{\value{L at lines}\@tempdima}%
+ \ifnum\value{L at lines}>1
+ \addtolength{\L at target@dp}{-\@tempdima}%
+ \else
+ \addtolength{\L at target@ht}{\L at target@dp}%
+ \setlength{\L at target@dp}{0pt}%
+ \fi
+ \setlength{\L at target@tht}{\L at target@ht}%
+ \addtolength{\L at target@tht}{\L at target@dp}%
+ \setlength{\L at height}{\L at target@tht}%
+ \addtolength{\L at height}{\L at oversize\L at target@tht}%
+ \ifL at image
+ \else
+ \ifL at selfref
+ \def\Lettrine at RefString{\l at refstring}%
+ \else
+ \def\Lettrine at RefString{\LettrineTestString}%
+ \fi
+ \sbox{\@tempboxa}{\LettrineFontHook
+ \fontsize{\L at height}{\L at height}\selectfont
+ \Lettrine at RefString}%
+ \@tempcnta=\ht\@tempboxa
+ \@tempcntb=\L at height
+ \ifL at vone
+ \multiply\@tempcntb by 100
+ \divide\@tempcnta by 100
+ \divide\@tempcntb by \@tempcnta
+ \advance\@tempcntb by -9999
+ \ifnum\@tempcntb>0
+ \def\L at factor{1.\the\@tempcntb}%
+ \else
+ \def\L at factor{1}%
+ \fi
+ \else
+ \MFPdiv{\the\@tempcntb}{\the\@tempcnta}\L at factor
+ \fi
+ \fi
+}
+\newcommand*{\LettrineFontHook}{}
+\newcommand*{\LettrineFont}{%
+ \LettrineFontHook
+ \fontsize{\L at factor\L at height}{\L at factor\L at height}%
+ \selectfont
+}
+\newcommand*{\LettrineFontEPS}{%
+ \LettrineFontHook\includegraphics[height=\L at height]%
+}
+\define at key{L}{lines}{\setcounter{L at lines}{#1}}
+\define at key{L}{depth}{\setcounter{L at depth}{#1}}
+\define at key{L}{lhang}{\renewcommand*{\L at hang}{#1}}
+\define at key{L}{loversize}{\renewcommand*{\L at oversize}{#1}}
+\define at key{L}{lraise}{\renewcommand*{\L at raise}{#1}}
+\define at key{L}{ante}{\renewcommand*{\L at ante}{#1}}
+\define at key{L}{findent}{\setlength{\L at Findent}{#1}}
+\define at key{L}{nindent}{\setlength{\L at Nindent}{#1}}
+\define at key{L}{slope}{\setlength{\L at slope}{#1}}
+\define at key{L}{image}[true]{\csname L at image#1\endcsname}
+\define at key{L}{grid}[true]{\csname L at grid#1\endcsname}
+\define at key{L}{realheight}[true]{\csname L at realh#1\endcsname}
+\define at key{L}{novskip}{\setlength{\L at novskip}{#1}}
+\define at key{L}{refstring}[\l at initial]{\L at selfreftrue
+ \def\l at refstring{#1}}
+\define at key{L}{Vone}[true]{\csname L at vone#1\endcsname}
+\newcommand*{\LettrineOptionsFor}[2]{\@namedef{l@#1-keys}{#2}}
+\def\lettrine{\@ifnextchar[\@lettrine{\@lettrine[]}}
+\def\@lettrine[#1]#2#3{%
+ \def\l at initial{#2}\let\l at refstring\l at initial
+ \setcounter{L at lines}{\value{DefaultLines}}%
+ \setcounter{L at depth}{\value{DefaultDepth}}%
+ \renewcommand*{\L at hang}{\DefaultLhang}%
+ \renewcommand*{\L at oversize}{\DefaultLoversize}%
+ \renewcommand*{\L at raise}{\DefaultLraise}%
+ \renewcommand*{\L at ante}{}%
+ \setlength{\L at Findent}{\DefaultFindent}%
+ \setlength{\L at Nindent}{\DefaultNindent}%
+ \setlength{\L at slope}{\DefaultSlope}%
+ \setlength{\L at novskip}{\DiscardVskip}%
+ \ifLettrineImage\L at imagetrue\else\L at imagefalse\fi
+ \ifLettrineOnGrid\L at gridtrue\else\L at gridfalse\fi
+ \ifLettrineRealHeight\L at realhtrue\else\L at realhfalse\fi
+ \ifLettrineVone\L at vonetrue\else\L at vonefalse\fi
+ \ifLettrineSelfRef\L at selfreftrue\else\L at selfreffalse\fi
+ \setkeys{L}{#1}%
+ \sbox{\L at tbox}{\LettrineTextFont{\LettrineSecondString}}%
+ \ifL at realh
+ \def\@tempa{#3}
+ \ifx\@tempa\@empty
+ \PackageWarning{lettrine.sty}%
+ {Empty second argument,\MessageBreak
+ ignoring option `realheight';}%
+ \else
+ \sbox{\L at tbox}{\LettrineTextFont{#3}}%
+ \fi
+ \fi
+ \if\DefaultOptionsFile\relax
+ \else
+ \begingroup
+ \InputIfFileExists{\DefaultOptionsFile}%
+ {}%
+ {\PackageWarning{lettrine.sty}%
+ {File \DefaultOptionsFile\space not found}%
+ }%
+ \def\color##1##{\l at color{##1}}%
+ \let\l at color\@gobbletwo
+ \def\textcolor##1##{\l at textcolor{##1}}%
+ \def\l at textcolor##1##2##3{##3}%
+ \expandafter\ifx\csname l@#2-keys\endcsname\relax
+ \gdef\l at LOKeys{}%
+ \else
+ \xdef\l at LOKeys{\csname l@#2-keys\endcsname}%
+ \fi
+ \endgroup
+ \def\KV at prefix{KV at L@}%
+ \let\@tempc\relax
+ \expandafter\KV at do\l at LOKeys,\relax,
+ \Lettrine at height
+ \sbox{\L at lbox}{\LettrineFont #2}%
+ \setlength{\LettrineWidth}{\wd\L at lbox}%
+ \def\KV at prefix{KV at L@}%
+ \let\@tempc\relax
+ \expandafter\KV at do\l at LOKeys,\relax,
+ \setkeys{L}{#1}%
+ \fi
+ \Lettrine at height
+ \ifL at image
+ \sbox{\L at lbox}{\LettrineFontEPS{#2}}%
+ \else
+ \sbox{\L at lbox}{\LettrineFont #2}%
+ \fi
+ \setlength{\LettrineWidth}{\wd\L at lbox}%
+ \setlength{\LettrineHeight}{\ht\L at lbox}%
+ \setlength{\LettrineDepth}{\dp\L at lbox}%
+ \begingroup
+ \def\IeC##1{##1}%
+ \@tempdima=\L at oversize pt\relax
+ \PackageInfo{lettrine.sty}%
+ {Targeted height = \the\L at target@tht\MessageBreak
+ (no accent, loversize=0),\MessageBreak
+ Lettrine height = \the\LettrineHeight\space (#2)%
+ \ifdim\@tempdima=\z@\else\space loversize=\L at oversize\fi;%
+ \MessageBreak reported}%
+ \endgroup
+ \sbox{\L at tbox}{\LettrineTextFont{#3}}%
+ \setlength{\L at first}{\LettrineHeight}%
+ \setlength{\L at lraise}{\L at raise\L at target@tht}%
+ \addtolength{\L at first}{\L at lraise}%
+ \ifnum\value{L at lines}=1
+ \addtolength{\L at first}{-\ht\L at tbox}%
+ \else
+ \addtolength{\L at first}{-\L at target@tht}%
+ \addtolength{\L at lraise}{-\L at target@dp}%
+ \fi
+ \par
+ \ifdim\L at first>\L at novskip
+ \ifL at grid
+ \@tempdima=\baselineskip
+ \@tempdimb=\@tempdima
+ \advance\@tempdimb by \L at novskip
+ \@tempcnta=1
+ \loop\ifdim\L at first>\@tempdimb
+ \advance\@tempcnta by 1
+ \advance\L at first by -\@tempdima
+ \repeat
+ \L at first=\@tempcnta\baselineskip
+ \fi
+ \vskip\L at first
+ \fi
+ \setlength{\L at Pindent}{\wd\L at lbox}%
+ \addtolength{\L at Pindent}{-\L at hang\wd\L at lbox}%
+ \settowidth{\L at first}{\L at ante}%
+ \addtolength{\L at Pindent}{\L at first}%
+ \addtolength{\L at Pindent}{\L at Findent}%
+ \setlength{\L at first}{\linewidth}%
+ \addtolength{\L at first}{-\L at Pindent}%
+ \addtolength{\L at Nindent}{\L at Pindent}%
+ \setlength{\L at next}{\linewidth}%
+ \addtolength{\L at next}{-\L at Nindent}%
+ \addtolength{\L at Pindent}{\rightmargin}%
+ \addtolength{\L at Nindent}{\rightmargin}%
+ \addtocounter{L at lines}{1}%
+ \addtocounter{L at lines}{\value{L at depth}}%
+ \def\L at parshape{\c at L@lines \the\L at Pindent \the\L at first}%
+ \@tempcnta=\tw@
+ \@whilenum \@tempcnta<\c at L@lines\do{%
+ \edef\L at parshape{\L at parshape \the\L at Nindent \the\L at next}%
+ \addtolength{\L at Nindent}{\L at slope}%
+ \addtolength{\L at next}{-\L at slope}%
+ \advance\@tempcnta\@ne}%
+ \edef\L at parshape{\L at parshape \rightmargin \the\linewidth}%
+ \noindent
+ \parshape=\L at parshape\relax
+ \smash{\llap{\mbox{\L at ante}\raisebox{\L at lraise}{\usebox{\L at lbox}}%
+ \hskip \the\L at Findent}}%
+ \usebox{\L at tbox}%
+}
+\InputIfFileExists{lettrine.cfg}
+ {\typeout{Loading lettrine.cfg}}
+ {\typeout{lettrine.cfg not found, using default values}}
+\endinput
+%%
+%% End of file `lettrine.sty'.
Property changes on: trunk/Master/texmf-dist/tex/latex/lettrine/lettrine-2018-08-18.sty
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: trunk/Master/texmf-dist/tex/latex/lettrine/lettrine.cfg
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lettrine/lettrine.cfg 2018-08-26 21:26:31 UTC (rev 48491)
+++ trunk/Master/texmf-dist/tex/latex/lettrine/lettrine.cfg 2018-08-26 21:26:43 UTC (rev 48492)
@@ -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'
Modified: trunk/Master/texmf-dist/tex/latex/lettrine/lettrine.sty
===================================================================
--- trunk/Master/texmf-dist/tex/latex/lettrine/lettrine.sty 2018-08-26 21:26:31 UTC (rev 48491)
+++ trunk/Master/texmf-dist/tex/latex/lettrine/lettrine.sty 2018-08-26 21:26:43 UTC (rev 48492)
@@ -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: <daniel (dot) flipo (at) free (dot) fr>
+%%
+\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 at lbox}
\newsavebox{\L at tbox}
@@ -72,7 +87,6 @@
\newif\ifL at image
\newif\ifL at grid
\newif\ifL at realh
-\newif\ifL at vone
\newif\ifL at selfref
\newcommand*{\LettrineTextFont}{\scshape}
\newcommand*{\LettrineTestString}{EFTZ}
@@ -103,19 +117,7 @@
\Lettrine at RefString}%
\@tempcnta=\ht\@tempboxa
\@tempcntb=\L at height
- \ifL at vone
- \multiply\@tempcntb by 100
- \divide\@tempcnta by 100
- \divide\@tempcntb by \@tempcnta
- \advance\@tempcntb by -9999
- \ifnum\@tempcntb>0
- \def\L at factor{1.\the\@tempcntb}%
- \else
- \def\L at factor{1}%
- \fi
- \else
- \MFPdiv{\the\@tempcntb}{\the\@tempcnta}\L at factor
- \fi
+ \MFPdiv{\the\@tempcntb}{\the\@tempcnta}\L at factor
\fi
}
\newcommand*{\LettrineFontHook}{}
@@ -142,7 +144,6 @@
\define at key{L}{novskip}{\setlength{\L at novskip}{#1}}
\define at key{L}{refstring}[\l at initial]{\L at selfreftrue
\def\l at refstring{#1}}
-\define at key{L}{Vone}[true]{\csname L at 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 at imagetrue\else\L at imagefalse\fi
\ifLettrineOnGrid\L at gridtrue\else\L at gridfalse\fi
\ifLettrineRealHeight\L at realhtrue\else\L at realhfalse\fi
- \ifLettrineVone\L at vonetrue\else\L at vonefalse\fi
\ifLettrineSelfRef\L at selfreftrue\else\L at selfreffalse\fi
\setkeys{L}{#1}%
\sbox{\L at tbox}{\LettrineTextFont{\LettrineSecondString}}%
More information about the tex-live-commits
mailing list