summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2008-04-29 17:24:08 +0000
committerKarl Berry <karl@freefriends.org>2008-04-29 17:24:08 +0000
commitfd50f7fb6d0e58972ed0c43863e90287b1ab03c4 (patch)
tree12deadde46db488b781bef3cb72f9339c215dbd5
parentfb16db91198c4ad4ddc4267ba7ae4d16ce94c56f (diff)
lettrine update (28apr08)
git-svn-id: svn://tug.org/texlive/trunk@7724 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/lettrine/README19
-rw-r--r--Master/texmf-dist/doc/latex/lettrine/demo-de.pdfbin129145 -> 123366 bytes
-rw-r--r--Master/texmf-dist/doc/latex/lettrine/demo.pdfbin125962 -> 121062 bytes
-rw-r--r--Master/texmf-dist/doc/latex/lettrine/lettrine.pdfbin134123 -> 134201 bytes
-rw-r--r--Master/texmf-dist/source/latex/lettrine/lettrine.dtx136
-rw-r--r--Master/texmf-dist/source/latex/lettrine/lettrine.ins49
-rw-r--r--Master/texmf-dist/tex/latex/lettrine/lettrine.cfg58
-rw-r--r--Master/texmf-dist/tex/latex/lettrine/lettrine.sty30
-rw-r--r--Master/texmf-dist/tex/latex/lettrine/pzc2.cfl45
-rw-r--r--Master/texmf-dist/tex/latex/lettrine/pzc3.cfl45
-rwxr-xr-xMaster/tlpkg/bin/ctan2tds3
11 files changed, 292 insertions, 93 deletions
diff --git a/Master/texmf-dist/doc/latex/lettrine/README b/Master/texmf-dist/doc/latex/lettrine/README
index 1bd99b905a1..008e7318b11 100644
--- a/Master/texmf-dist/doc/latex/lettrine/README
+++ b/Master/texmf-dist/doc/latex/lettrine/README
@@ -3,6 +3,10 @@
This bundle contains a package that I maintain to typeset dropped
capitals in a LaTeXe document.
+It is subject to the LaTeX Project Public License.
+See http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
+for the details of that license.
+
Run (pdf)latex on lettrine.dtx to get the documentation (lettrine.dvi
or lettrine.pdf), then on lettrine.ins to strip the comments and create
lettrine.sty.
@@ -13,6 +17,17 @@ Have a look at one of the PDF files, demo.pdf (in French), or
demo-de.pdf (in German) in the doc directory, to see how
different layouts for dropped capitals can be achieved.
You can also play with the source files demo.tex or demo-de.tex.
+Have a look at lettrine.pdf in the doc directory, if you are interested
+in the complete documentation and code.
+
+Installation: this bundle is included in most TeX distributions, but
+if you need to install it by yourself, a TDS compliant zip archive is
+provided (lettrine.tds.zip). Just download that file , and unpack it
+in your TDS directory (~/texmf for Unix-like systems). That's all! you
+have got everything in place including documentation and sources.
+On MikTeX/Windows, please use the very efficient management of updates
+provided by MIkTeX.
-Daniel Flipo, <Daniel.Flipo@univ-lille1.fr>
-May 19th, 2004.
+--
+Daniel Flipo, <daniel.flipo@free.fr>
+April, 23rd, 2008.
diff --git a/Master/texmf-dist/doc/latex/lettrine/demo-de.pdf b/Master/texmf-dist/doc/latex/lettrine/demo-de.pdf
index cc2f70f0e75..51b8441de59 100644
--- a/Master/texmf-dist/doc/latex/lettrine/demo-de.pdf
+++ b/Master/texmf-dist/doc/latex/lettrine/demo-de.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/lettrine/demo.pdf b/Master/texmf-dist/doc/latex/lettrine/demo.pdf
index 38712d068b5..39adbfe76b9 100644
--- a/Master/texmf-dist/doc/latex/lettrine/demo.pdf
+++ b/Master/texmf-dist/doc/latex/lettrine/demo.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf b/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf
index 4bb30a6eabe..54a45bfe9c3 100644
--- a/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf
+++ b/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf
Binary files differ
diff --git a/Master/texmf-dist/source/latex/lettrine/lettrine.dtx b/Master/texmf-dist/source/latex/lettrine/lettrine.dtx
index a3721b854ac..62b490600a3 100644
--- a/Master/texmf-dist/source/latex/lettrine/lettrine.dtx
+++ b/Master/texmf-dist/source/latex/lettrine/lettrine.dtx
@@ -1,54 +1,71 @@
%
-% Copyright 1999-2004 Daniel Flipo.
+% \CheckSum{445}
+%
+% \iffalse meta-comment
+%
+% Copyright (C) 1999-2007 Daniel Flipo.
%
% This program can be redistributed and/or modified under the terms
-% of the LaTeX Project Public License Distributed from CTAN
-% archives in directory macros/latex/base/lppl.txt; either
-% version 1 of the License, or any later version.
+% of the LaTeX Project Public License either version 1.3 of this
+% license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2003/12/01 or later.
%
+% This file has the LPPL maintenance status "maintained".
+%
% NO PERMISSION is granted to produce or to distribute a
% modified version of this file under its original name.
-%
-% \CheckSum{427}
+%
+% \fi
%
% \iffalse
-% Tell the \LaTeX\ system who we are and write an entry on the
-% transcript.
+%
+%<*sty>
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+\ProvidesFile{lettrine.sty}
+%</sty>
%<*dtx>
\ProvidesFile{lettrine.dtx}
%</dtx>
-%<code>\ProvidesFile{lettrine.sty}
-%\fi
-%\ProvidesFile{lettrine.dtx}
- [2004/05/22 v1.6 (D. Flipo)]
-%\iffalse
+%<*!cfg>
+ [2007/08/08 v1.62 (Daniel Flipo)]
+%</!cfg>
+%
% Lettrine package for LaTeX version 2e
%
-% Copyright (C) 1999-2004 by Daniel Flipo
+% Copyright (C) 1999-2007 by Daniel Flipo
%
-% Please report errors to: Daniel.Flipo@univ-lille1.fr
+% Please report errors to: Daniel.Flipo at univ-lille1.fr
+%
+%<*driver>
+\documentclass[a4paper]{ltxdoc}
+\usepackage{lettrine}
+\GetFileInfo{lettrine.dtx}
+\RecordChanges
+%\OnlyDescription
%
-%<*filedriver>
-\documentclass{ltxdoc}
\newenvironment{key}[2]{\expandafter\macro\expandafter{%
\csname KV@#1@#2\endcsname}}{\endmacro}
%
\newcommand*\file[1]{\texttt{#1}}
%
-\parindent = 0pt
-\parskip = .3\baselineskip
+\newcommand{\at}{@}
+\setlength{\parindent}{0pt}
+\setlength{\parskip}{.3\baselineskip}
\begin{document}
\begin{center}
\textbf{\Large Typesetting `lettrines' in \LaTeXe{} documents}
- \\[.2\baselineskip]
+ \\[.2\baselineskip]^^A\]
{\large Daniel \textsc{Flipo}}\\
- \texttt{Daniel.Flipo@univ-lille1.fr}
+ \texttt{Daniel.Flipo\at univ-lille1.fr}
\end{center}
- \DocInput{lettrine.dtx}
+\DocInput{lettrine.dtx}
\end{document}
-%</filedriver>
+%</driver>
+%
%\fi
-% \GetFileInfo{lettrine.dtx}
%
% \section{Introduction}
%
@@ -252,17 +269,18 @@
% are implemented as \emph{lists} in \LaTeX{}.
% \end{itemize}
%
-% \StopEventually{}
+% \StopEventually{\PrintChanges}
%
% \pagebreak[3]
% \section{\TeX{}nical details}
%
% This package only runs with \LaTeXe{} and requires keyval.sty
+% \iffalse
+%<*sty>
+% \fi
+%
% \begin{macrocode}
-%<*code>
-%% Please report errors to: Daniel.Flipo@univ-lille1.fr
-%%
-\NeedsTeXFormat{LaTeX2e}[1995/12/01]
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\RequirePackage{keyval}
% \end{macrocode}
%
@@ -650,11 +668,55 @@
% This ends the definition of |\lettrine|.\\
% Load a local config file if present in \LaTeX{}'s search path.
% \begin{macrocode}
-\InputIfFileExists{lettrine.cfg}{}{}
-%</code>
+\InputIfFileExists{lettrine.cfg}
+ {\typeout{Loading lettrine.cfg}}
+ {\typeout{lettrine.cfg not found, using default values}}
% \end{macrocode}
+% \iffalse
+%</sty>
+% \fi
%
-% \Finale
+% \section{Fichier de configuration}
+%
+% \iffalse
+%<*cfg>
+% \fi
+% \begin{macrocode}
+%% lettrine.cfg: configuration file for lettrine.sty
+%%
+%% If you want to customize lettrine, please *do not* hack into the
+%% code, copy this file to the directory where lettrine.sty lies
+%% and customize it as you like.
+%%
+%% Uncomment these lines and change the parameters' values to fit
+%% your needs (see lettrine.dtx).
+%%
+%%\setcounter{DefaultLines}{2}
+%%
+%% These are *decimal* numbers:
+%%\renewcommand{\DefaultLoversize}{0}
+%%\renewcommand{\DefaultLraise}{0}
+%%\renewcommand{\DefaultLhang}{0}
+%%
+%% These are *lengths* (don't forget the unit):
+%%\setlength{\DefaultFindent}{0pt}
+%%\setlength{\DefaultNindent}{0.5em}
+%%\setlength{\DefaultSlope}{0mm}
+%%
+%% This is a *flag* (value=true/false):
+%%\LettrineImagefalse
+%%
+%% In case you want to set parameters for some letters
+%% in file `optfile.cfl'
+%%\renewcommand{\DefaultOptionsFile}{optfile.cfl}
+% \end{macrocode}
+% \iffalse
+%</cfg>
+% \fi
+%
+% \iffalse
+%<*dtx>
+% \fi
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -672,4 +734,14 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
%%
+% \iffalse
+%</dtx>
+% \fi
+%
+% \Finale
\endinput
+
+%%% Local Variables:
+%%% fill-column: 70
+%%% coding: latin-1
+%%% End:
diff --git a/Master/texmf-dist/source/latex/lettrine/lettrine.ins b/Master/texmf-dist/source/latex/lettrine/lettrine.ins
index f8ef8175632..e71866caee3 100644
--- a/Master/texmf-dist/source/latex/lettrine/lettrine.ins
+++ b/Master/texmf-dist/source/latex/lettrine/lettrine.ins
@@ -1,25 +1,62 @@
%%
+%% Copyright (C) 1999-2007 Daniel Flipo.
+%%
+%% This program can be redistributed and/or modified under the terms
+%% of the LaTeX Project Public License either version 1.3 of this
+%% license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2003/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
+
+{\ifx\generate\undefined
+\Msg{**********************************************}
+\Msg{*}
+\Msg{* This installation requires docstrip}
+\Msg{* version 2.3c or later.}
+\Msg{*}
+\Msg{* An older version of docstrip has been input}
+\Msg{*}
+\Msg{**********************************************}
+\errhelp{Move or rename old docstrip.tex.}
+\errmessage{Old docstrip in input path}
+\batchmode
+\csname @@end\endcsname
+\fi}
+
\keepsilent
-\generateFile{lettrine.sty}{f}{\from{lettrine.dtx}{code}}
+\usedir{tex/latex/lettrine}
+
+\generate{\file{lettrine.sty}{\from{lettrine.dtx}{sty}}
+ }
+
+\nopreamble
+\generate{\file{lettrine.cfg}{\from{lettrine.dtx}{cfg}}
+ }
\Msg{***********************************************************}
\Msg{*}
\Msg{* To finish the installation you have to move lettrine.sty}
-\Msg{* into a directory searched by TeX.}
+\Msg{* lettrine.cfg and the *.cfl files from the contrib}
+\Msg{* directory into a directory searched by TeX.}
+\Msg{*}
+\Msg{* If you want to change the default settings, uncomment the}
+\Msg{* lines you want in file lettrine.cfg and customize them.}
\Msg{*}
-\Msg{* If you want to change the default settings, you can do so}
-\Msg{* by copying lettrine.cfg to the directory where you will}
-\Msg{* install lettrine.sty and uncomment the lines you want to}
-\Msg{* change.}
+\Msg{* To produce the documentation}
+\Msg{* run lettrine.dtx through LaTeX or pdfLaTeX.}
\Msg{*}
\Msg{* Happy TeXing!}
\Msg{*}
\Msg{***********************************************************}
+\endbatchfile
+\endinput
diff --git a/Master/texmf-dist/tex/latex/lettrine/lettrine.cfg b/Master/texmf-dist/tex/latex/lettrine/lettrine.cfg
index 042aab49ccc..96ecca016b4 100644
--- a/Master/texmf-dist/tex/latex/lettrine/lettrine.cfg
+++ b/Master/texmf-dist/tex/latex/lettrine/lettrine.cfg
@@ -1,30 +1,30 @@
-%%% lettrine.cfg: configuration file for lettrine.sty
-%%% Daniel Flipo <Daniel.Flipo@univ-lille1.fr>
-
-%%% If you want to customize lettrine, please *do not* hack into the
-%%% code, copy this file to the directory where lettrine.sty lies
-%%% and customize it as you like.
-
-%%% Uncomment these lines and change the parameters' values to fit
-%%% your needs (see lettrine.dtx).
-
-%\setcounter{DefaultLines}{2}
-
-%%% These are *decimal* numbers:
-%\renewcommand{\DefaultLoversize}{0}
-%\renewcommand{\DefaultLraise}{0}
-%\renewcommand{\DefaultLhang}{0}
-
-%%% These are *lengths* (don't forget the unit):
-%\setlength{\DefaultFindent}{0pt}
-%\setlength{\DefaultNindent}{0.5em}
-%\setlength{\DefaultSlope}{0mm}
-
-%%% This is a *flag* (value=true/false):
-%\LettrineImagefalse
-
-%%% In case you want to set parameters for some letters
-%%% in file `optfile.cfl'
-%\renewcommand{\DefaultOptionsFile}{optfile.cfl}
-
+%% lettrine.cfg: configuration file for lettrine.sty
+%%
+%% If you want to customize lettrine, please *do not* hack into the
+%% code, copy this file to the directory where lettrine.sty lies
+%% and customize it as you like.
+%%
+%% Uncomment these lines and change the parameters' values to fit
+%% your needs (see lettrine.dtx).
+%%
+%%\setcounter{DefaultLines}{2}
+%%
+%% These are *decimal* numbers:
+%%\renewcommand{\DefaultLoversize}{0}
+%%\renewcommand{\DefaultLraise}{0}
+%%\renewcommand{\DefaultLhang}{0}
+%%
+%% These are *lengths* (don't forget the unit):
+%%\setlength{\DefaultFindent}{0pt}
+%%\setlength{\DefaultNindent}{0.5em}
+%%\setlength{\DefaultSlope}{0mm}
+%%
+%% This is a *flag* (value=true/false):
+%%\LettrineImagefalse
+%%
+%% In case you want to set parameters for some letters
+%% in file `optfile.cfl'
+%%\renewcommand{\DefaultOptionsFile}{optfile.cfl}
\endinput
+%%
+%% End of file `lettrine.cfg'.
diff --git a/Master/texmf-dist/tex/latex/lettrine/lettrine.sty b/Master/texmf-dist/tex/latex/lettrine/lettrine.sty
index c327b305bb9..80d73228617 100644
--- a/Master/texmf-dist/tex/latex/lettrine/lettrine.sty
+++ b/Master/texmf-dist/tex/latex/lettrine/lettrine.sty
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% lettrine.dtx (with options: `code')
+%% lettrine.dtx (with options: `sty')
%%
%% IMPORTANT NOTICE:
%%
@@ -20,11 +20,10 @@
%% 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}
- [2004/05/22 v1.6 (D. Flipo)]
-%% Please report errors to: Daniel.Flipo@univ-lille1.fr
-%%
-\NeedsTeXFormat{LaTeX2e}[1995/12/01]
+ [2007/08/08 v1.62 (Daniel Flipo)]
+\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\RequirePackage{keyval}
\newcounter{DefaultLines}
\setcounter{DefaultLines}{2}
@@ -189,24 +188,9 @@
$\smash{\llap{\mbox{\L@ante}\raisebox{\L@lraise}{\usebox{\L@lbox}}%
\hskip \the\L@Findent}}$%
\usebox{\L@tbox}}
-\InputIfFileExists{lettrine.cfg}{}{}
-%%
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
+\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/pzc2.cfl b/Master/texmf-dist/tex/latex/lettrine/pzc2.cfl
new file mode 100644
index 00000000000..114574026ff
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lettrine/pzc2.cfl
@@ -0,0 +1,45 @@
+%%% This is file `pzc2.cfl'.
+%%% It is provided under the LPPL. Copyright is held by Kevin M. Dunn.
+%%% If you modify this file you *MUST* change its name.
+%%%
+%%% This file contains config values to simplify the use of the
+%%% Zapf-Chancery (aka pzc) font with the lettrine package by Daniel Flipo.
+%%% This file provides the parameters for 2 DefaultLines.
+%%%
+%%% If you want to use this file, your document should contain
+%%% the next three lines, without the leading percent signs.
+%%% \setcounter{DefaultLines}{2}
+%%% \renewcommand\LettrineFontHook{\fontencoding{T1}\fontfamily{pzc}\selectfont}
+%%% \renewcommand{\DefaultOptionsFile}{pzc2.cfl}
+%%%
+%%% Comments about this file can be sent to Kevin Dunn
+%%% (cavema2 at cavemanchemistry.com)
+%%%
+\ProvidesFile{pzc2.cfl}[2006/03/19 v0.1 Kevin M. Dunn]
+\LettrineOptionsFor{A}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.05\LettrineWidth,nindent= 0.25\LettrineWidth}
+\LettrineOptionsFor{B}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.10\LettrineWidth,nindent= 0.08\LettrineWidth}
+\LettrineOptionsFor{C}{loversize= 0.35,lraise= 0.10,lhang= 0.35,findent= 0.00\LettrineWidth,nindent= 0.28\LettrineWidth}
+\LettrineOptionsFor{D}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.15\LettrineWidth,nindent= 0.05\LettrineWidth}
+\LettrineOptionsFor{E}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.00\LettrineWidth,nindent= 0.28\LettrineWidth}
+\LettrineOptionsFor{F}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.10\LettrineWidth,nindent= 0.00\LettrineWidth}
+\LettrineOptionsFor{G}{loversize= 0.35,lraise= 0.10,lhang= 0.35,findent= 0.10\LettrineWidth,nindent= 0.17\LettrineWidth}
+\LettrineOptionsFor{H}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.10\LettrineWidth,nindent= 0.20\LettrineWidth}
+\LettrineOptionsFor{I}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.05\LettrineWidth,nindent= 0.25\LettrineWidth}
+\LettrineOptionsFor{J}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.15\LettrineWidth,nindent= 0.00\LettrineWidth}
+\LettrineOptionsFor{K}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.05\LettrineWidth,nindent= 0.13\LettrineWidth}
+\LettrineOptionsFor{L}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=-0.02\LettrineWidth,nindent= 0.30\LettrineWidth}
+\LettrineOptionsFor{M}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.05\LettrineWidth,nindent= 0.15\LettrineWidth}
+\LettrineOptionsFor{N}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.10\LettrineWidth,nindent= 0.10\LettrineWidth}
+\LettrineOptionsFor{O}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.15\LettrineWidth,nindent= 0.08\LettrineWidth}
+\LettrineOptionsFor{P}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.25\LettrineWidth,nindent= 0.05\LettrineWidth}
+\LettrineOptionsFor{Q}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.15\LettrineWidth,nindent= 0.10\LettrineWidth}
+\LettrineOptionsFor{R}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.08\LettrineWidth,nindent= 0.15\LettrineWidth}
+\LettrineOptionsFor{S}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.10\LettrineWidth,nindent= 0.13\LettrineWidth}
+\LettrineOptionsFor{T}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.05\LettrineWidth,nindent= 0.20\LettrineWidth}
+\LettrineOptionsFor{U}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.05\LettrineWidth,nindent= 0.15\LettrineWidth}
+\LettrineOptionsFor{V}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.18\LettrineWidth,nindent=-0.15\LettrineWidth}
+\LettrineOptionsFor{W}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.15\LettrineWidth,nindent=-0.05\LettrineWidth}
+\LettrineOptionsFor{X}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.00\LettrineWidth,nindent= 0.35\LettrineWidth}
+\LettrineOptionsFor{Y}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.10\LettrineWidth,nindent= 0.05\LettrineWidth}
+\LettrineOptionsFor{Z}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent= 0.00\LettrineWidth,nindent= 0.30\LettrineWidth}
+\endinput
diff --git a/Master/texmf-dist/tex/latex/lettrine/pzc3.cfl b/Master/texmf-dist/tex/latex/lettrine/pzc3.cfl
new file mode 100644
index 00000000000..a67ba9b5b0e
--- /dev/null
+++ b/Master/texmf-dist/tex/latex/lettrine/pzc3.cfl
@@ -0,0 +1,45 @@
+%%% This is file `pzc2.cfl'.
+%%% It is provided under the LPPL. Copyright is held by Kevin M. Dunn.
+%%% If you modify this file you *MUST* change its name.
+%%%
+%%% This file contains config values to simplify the use of the
+%%% Zapf-Chancery (aka pzc) font with the lettrine package by Daniel Flipo.
+%%% This file provides the parameters for 3 DefaultLines.
+%%%
+%%% If you want to use this file, your document should contain
+%%% the next three lines, without the leading percent signs.
+%%% \setcounter{DefaultLines}{3}
+%%% \renewcommand\LettrineFontHook{\fontencoding{T1}\fontfamily{pzc}\selectfont}
+%%% \renewcommand{\DefaultOptionsFile}{pzc3.cfl}
+%%%
+%%% Comments about this file can be sent to Kevin Dunn
+%%% (cavema2 at cavemanchemistry.com)
+
+\ProvidesFile{pzc3.cfl}[2006/03/19 v0.1 Kevin M. Dunn]
+\LettrineOptionsFor{A}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.05\LettrineWidth,nindent= 0.25\LettrineWidth}
+\LettrineOptionsFor{B}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.10\LettrineWidth,nindent= 0.08\LettrineWidth,slope=-0.08\LettrineWidth}
+\LettrineOptionsFor{C}{loversize= 0.35,lraise= 0.10,lhang= 0.35,findent=0.00\LettrineWidth,nindent= 0.28\LettrineWidth}
+\LettrineOptionsFor{D}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.15\LettrineWidth,nindent= 0.05\LettrineWidth,slope=-0.05\LettrineWidth}
+\LettrineOptionsFor{E}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.00\LettrineWidth,nindent= 0.28\LettrineWidth}
+\LettrineOptionsFor{F}{loversize= 0.35,lraise= 0.05,lhang= 0.35,findent=0.10\LettrineWidth,nindent= 0.00\LettrineWidth}
+\LettrineOptionsFor{G}{loversize= 0.30,lraise= 0.30,lhang= 0.5,findent=0.10\LettrineWidth,nindent= 0.15\LettrineWidth}
+\LettrineOptionsFor{H}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.10\LettrineWidth,nindent= 0.20\LettrineWidth}
+\LettrineOptionsFor{I}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.05\LettrineWidth,nindent= 0.25\LettrineWidth}
+\LettrineOptionsFor{J}{loversize= 0.35,lraise= 0.05,lhang= 0.35,findent=0.15\LettrineWidth,nindent= 0.00\LettrineWidth}
+\LettrineOptionsFor{K}{loversize= 0.30,lraise= 0.20,lhang= 0.35,findent=0.05\LettrineWidth,nindent= 0.13\LettrineWidth,slope= 0.20\LettrineWidth}
+\LettrineOptionsFor{L}{loversize= 0.35,lraise= 0.00,lhang=0.35,findent=-0.02\LettrineWidth,nindent= 0.30\LettrineWidth}
+\LettrineOptionsFor{M}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.05\LettrineWidth,nindent= 0.15\LettrineWidth}
+\LettrineOptionsFor{N}{loversize= 0.30,lraise= 0.20,lhang= 0.35,findent=0.10\LettrineWidth,nindent= 0.10\LettrineWidth,slope= 0.20\LettrineWidth}
+\LettrineOptionsFor{O}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.15\LettrineWidth,nindent= 0.08\LettrineWidth}
+\LettrineOptionsFor{P}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.25\LettrineWidth,nindent= 0.05\LettrineWidth}
+\LettrineOptionsFor{Q}{loversize= 0.30,lraise= 0.25,lhang= 0.35,findent=0.15\LettrineWidth,nindent= 0.10\LettrineWidth,slope= 0.20\LettrineWidth}
+\LettrineOptionsFor{R}{loversize= 0.30,lraise= 0.20,lhang= 0.35,findent=0.08\LettrineWidth,nindent= 0.15\LettrineWidth,slope= 0.20\LettrineWidth}
+\LettrineOptionsFor{S}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.10\LettrineWidth,nindent= 0.13\LettrineWidth}
+\LettrineOptionsFor{T}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.05\LettrineWidth,nindent= 0.20\LettrineWidth}
+\LettrineOptionsFor{U}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.05\LettrineWidth,nindent= 0.15\LettrineWidth}
+\LettrineOptionsFor{V}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.18\LettrineWidth,nindent=-0.05\LettrineWidth,slope=-0.15\LettrineWidth}
+\LettrineOptionsFor{W}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.18\LettrineWidth,nindent=-0.05\LettrineWidth,slope=-0.10\LettrineWidth}
+\LettrineOptionsFor{X}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.00\LettrineWidth,nindent= 0.35\LettrineWidth}
+\LettrineOptionsFor{Y}{loversize= 0.30,lraise= 0.10,lhang= 0.40,findent=0.10\LettrineWidth,nindent= 0.00\LettrineWidth,slope=-0.10\LettrineWidth}
+\LettrineOptionsFor{Z}{loversize= 0.35,lraise= 0.00,lhang= 0.35,findent=0.00\LettrineWidth,nindent= 0.30\LettrineWidth}
+\endinput
diff --git a/Master/tlpkg/bin/ctan2tds b/Master/tlpkg/bin/ctan2tds
index 36c956587e9..50f6a24dd7f 100755
--- a/Master/tlpkg/bin/ctan2tds
+++ b/Master/tlpkg/bin/ctan2tds
@@ -214,10 +214,11 @@ chdir $startdir || die "chdir($startdir) failed: $!"; # back to raw
'latex-tds', "&MAKEcopy", # we use latex-tds/source.zip
'latex-veryshortguide', "die 'skipping, nosell license'",
'latexmp', "&MAKEflatten",
+# 'lcyw', "&MAKEunzip",
'leading', "&MAKEleading",
'leawood', "&MAKEflatten",
'lettre', "&MAKEflatten",
- 'lettrine', "&MAKEflatten",
+ 'lettrine', "&MAKEunzip",
'lexitex', "die 'skipping, camel has replaced'",
'lfb', "&MAKElfb",
'lh', "&MAKEcopy",