From dce332ec1dc8b171a886c68e3fa442edc482fd17 Mon Sep 17 00:00:00 2001 From: Karl Berry Date: Thu, 4 Sep 2014 21:10:42 +0000 Subject: lettrine (4sep14) git-svn-id: svn://tug.org/texlive/trunk@35107 c570f23f-e606-0410-a88d-b1316a301751 --- Master/texmf-dist/doc/latex/lettrine/README | 6 +-- Master/texmf-dist/doc/latex/lettrine/demo-de.pdf | Bin 122256 -> 122227 bytes Master/texmf-dist/doc/latex/lettrine/demo-de.tex | 6 +-- Master/texmf-dist/doc/latex/lettrine/demo.pdf | Bin 119297 -> 119274 bytes Master/texmf-dist/doc/latex/lettrine/demo.tex | 38 +++++++------- Master/texmf-dist/doc/latex/lettrine/lettrine.pdf | Bin 223342 -> 224257 bytes .../texmf-dist/source/latex/lettrine/lettrine.dtx | 39 ++++++++------ .../texmf-dist/source/latex/lettrine/lettrine.ins | 8 +-- Master/texmf-dist/tex/latex/lettrine/lettrine.sty | 14 +++-- Master/texmf-dist/tex/latex/lettrine/pacl.cfl | 58 ++++++++++----------- Master/texmf-dist/tex/latex/lettrine/padl.cfl | 16 +++--- Master/texmf-dist/tex/latex/lettrine/pzc2.cfl | 56 ++++++++++---------- 12 files changed, 128 insertions(+), 113 deletions(-) (limited to 'Master') diff --git a/Master/texmf-dist/doc/latex/lettrine/README b/Master/texmf-dist/doc/latex/lettrine/README index 008e7318b11..478fbe69281 100644 --- a/Master/texmf-dist/doc/latex/lettrine/README +++ b/Master/texmf-dist/doc/latex/lettrine/README @@ -3,8 +3,8 @@ 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 +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 @@ -14,7 +14,7 @@ lettrine.sty. If you wish, you can customize lettrine.cfg according to your needs. 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 +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 diff --git a/Master/texmf-dist/doc/latex/lettrine/demo-de.pdf b/Master/texmf-dist/doc/latex/lettrine/demo-de.pdf index 0f6a25a52ad..ba1beb147df 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-de.tex b/Master/texmf-dist/doc/latex/lettrine/demo-de.tex index 31328e9c167..5f11589a69b 100644 --- a/Master/texmf-dist/doc/latex/lettrine/demo-de.tex +++ b/Master/texmf-dist/doc/latex/lettrine/demo-de.tex @@ -133,8 +133,8 @@ bietet auch das {\glqq}V{\grqq} keine Schwierigkeiten mehr. Wie das beim \vspace{\baselineskip} \textit{Verwendung der Option {\ttfamily\upshape slope}, damit der Text -der Neigung des {\ttfamily\upshape V} folgt; Das {\ttfamily\upshape V} ragt -zus\"atzlich halb in den Rand hinein +der Neigung des {\ttfamily\upshape V} folgt; Das {\ttfamily\upshape V} ragt +zus\"atzlich halb in den Rand hinein (Option {\ttfamily\upshape lhang=0.5} :})\\ \verb+\lettrine[lines=4, slope=-0.5em, lhang=0.5, nindent=0pt]+\\ \verb+ {V}{iel} ist...+ @@ -182,7 +182,7 @@ die Initiale in Grau mit \verb+\color[gray]{0.5}+. \vspace{\baselineskip} Wenn die erw\"unschte Initiale nicht als Zeichen eines Fonts, sondern als Bild im Postscript-Format vorliegt, kann ebenfalls -\verb+\lettrine+ verwendet werden. Es gen\"ugt, +\verb+\lettrine+ verwendet werden. Es gen\"ugt, die Boolsche Variable \texttt{image=true} zu ben\"utzen; z.B. so: \vspace{.5\baselineskip} diff --git a/Master/texmf-dist/doc/latex/lettrine/demo.pdf b/Master/texmf-dist/doc/latex/lettrine/demo.pdf index 47e0512ac84..0c7be242c75 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 8c900b99db5..cc4fcec0367 100644 --- a/Master/texmf-dist/doc/latex/lettrine/demo.tex +++ b/Master/texmf-dist/doc/latex/lettrine/demo.tex @@ -7,7 +7,7 @@ %%% Palatino fonts... \usepackage[T1]{fontenc} \usepackage{palatino} -%%% ... or EC fonts ... +%%% ... or EC fonts ... %\usepackage[T1]{fontenc} %\usepackage{type1ec} %%% ... or LM fonts @@ -37,7 +37,7 @@ \thispagestyle{empty} \begin{center} -\large\bfseries Quelques exemples de lettrines +\large\bfseries Quelques exemples de lettrines \end{center} \vspace{\baselineskip} @@ -55,15 +55,15 @@ l'une des \og abbayes de sel\fg{} dont il ne reste que quelques vestiges. \verb+\lettrine[lines=1]{E}{n} plein marais...+ \lettrine[lines=1]{E}{n} plein marais de la Souteyranne, -\`a quelques kilom\`etres au nord d'Aigues-Mortes, se trouve +\`a quelques kilom\`etres au nord d'Aigues-Mortes, se trouve la Tour Carbonni\`ere. \vspace{\baselineskip} \textit{Lettrine sur trois lignes (option {\ttfamily\upshape lines=3}) :}\\ \verb+\lettrine[lines=3]{E}{n} plein marais...+ -\lettrine[lines=3]{E}{n} plein marais de la Souteyranne, -\`a quelques kilom\`etres au nord d'Aigues-Mortes, +\lettrine[lines=3]{E}{n} plein marais de la Souteyranne, +\`a quelques kilom\`etres au nord d'Aigues-Mortes, se trouve la Tour Carbonni\`ere. Construite au XIII\ieme~si\`ecle, elle contr\^olait l'unique voie d'acc\`es terrestre de la ville fortifi\'ee, celle qui menait \`a Psalmody, @@ -73,8 +73,8 @@ l'une des \og abbayes de sel\fg{} dont il ne reste que quelques vestiges. \textit{Lettrine compl\`etement dans la marge} :\\ \verb+\lettrine[lhang=1, nindent=0pt, lines=3]{J}{ustement},...+ -\lettrine[lhang=1, nindent=0pt, lines=3]{J}{ustement}, -\`a quelques kilom\`etres au nord d'Aigues-Mortes, +\lettrine[lhang=1, nindent=0pt, lines=3]{J}{ustement}, +\`a quelques kilom\`etres au nord d'Aigues-Mortes, se trouve la Tour Carbonni\`ere. Construite au XIII\ieme~si\`ecle, elle contr\^olait l'unique voie d'acc\`es terrestre de la ville fortifi\'ee, celle qui menait \`a Psalmody, @@ -86,7 +86,7 @@ qui la reliait au ch\^ateau de Treillan. \textit{Lettrine en saillie \`a la fois en hauteur et dans la marge} :\\ \verb+\lettrine[lines=3, lhang=0.33, loversize=0.25]{E}{n} ...+ -\lettrine[lines=3, lhang=0.33, loversize=0.25]{E}{n} +\lettrine[lines=3, lhang=0.33, loversize=0.25]{E}{n} plein marais de la Souteyranne, \`a quelques kilom\`etres au nord d'Aigues-Mortes la Tour Carbonni\`ere. Construite au XIII\ieme~si\`ecle, elle contr\^olait l'unique voie d'acc\`es @@ -99,7 +99,7 @@ l'une des \og abbayes de sel\fg{} \dots \verb+\lettrine[ante=\og]{E}{n} plein marais ...+ \lettrine[ante=\og]{E}{n} plein marais de la Souteyranne, -\`a quelques kilom\`etres au nord d'Aigues-Mortes, se trouve +\`a quelques kilom\`etres au nord d'Aigues-Mortes, se trouve la Tour Carbonni\`ere. Construite au XIII\ieme~si\`ecle, elle contr\^olait l'unique voie d'acc\`es terrestre de la ville fortifi\'ee, celle qui menait \`a Psalmody, @@ -112,12 +112,12 @@ Toutes Les lettrines suivantes seront en gris jusqu' \renewcommand{\LettrineFontHook}{\color[gray]{0.5}} \vspace{.5\baselineskip} -\textit{On diminue la taille de la lettrine de 10\% et on +\textit{On diminue la taille de la lettrine de 10\% et on la remonte de 10\% \`a cause du \og Q {\fg}} \verb+\lettrine[lines=4, loversize=-0.1, lraise=0.1]{Q}{u'en...+ \lettrine[lines=4, loversize=-0.1, lraise=0.1]{Q}{u'en plein marais} - de la Souteyranne, \`a quelques kilom\`etres au nord d'Aigues-Mortes, + de la Souteyranne, \`a quelques kilom\`etres au nord d'Aigues-Mortes, se trouve la Tour Carbonni\`ere, surprend les visiteurs. Construite au XIII\ieme~si\`ecle, elle contr\^olait l'unique voie d'acc\`es terrestre de la ville fortifi\'ee, celle qui menait \`a Psalmody, @@ -130,7 +130,7 @@ la reliait au ch\^ateau de Treillan. \verb+\lettrine[lines=4]{Q}{u'en plein marais} de ...+ \lettrine[lines=4]{Q}{u'en plein marais} de la Souteyranne, -\`a quelques kilom\`etres au nord d'Aigues-Mortes, +\`a quelques kilom\`etres au nord d'Aigues-Mortes, se trouve la Tour Carbonni\`ere, surprend les visiteurs. Construite au XIII\ieme~si\`ecle, elle contr\^olait l'unique voie d'acc\`es terrestre de la ville fortifi\'ee, celle qui menait \`a Psalmody, @@ -144,7 +144,7 @@ suive la pente du \og \`A \fg :\\ \verb+\lettrine[lines=4, slope=0.6em, findent=-1em,+\\ \verb+ nindent=0.6em]{\`A}{quelques kilom\`etres}...+ -\lettrine[lines=4, slope=0.6em, findent=-1em, nindent=0.6em]{\`A} {quelques +\lettrine[lines=4, slope=0.6em, findent=-1em, nindent=0.6em]{\`A} {quelques kilom\`etres} au nord d'Aigues-Mortes, se trouve la Tour Carbonni\`ere. Construite au XIII\ieme~si\`ecle, elle contr\^olait l'unique voie d'acc\`es terrestre de la ville fortifi\'ee, celle qui menait \`a Psalmody, @@ -168,7 +168,7 @@ L'abbaye \'etait ravitaill\'ee ---~dit-on~--- par un souterrain qui la reliait au ch\^ateau de Treillan. \vspace{.5\baselineskip} -\textit{Changement de police (ici AvantGarde gras italique) +\textit{Changement de police (ici AvantGarde gras italique) et de couleur pour la lettrine :}\\ \verb+\renewcommand{\LettrineFontHook}{\fontfamily{pag}%+\\ \verb+ \fontseries{bx}\fontshape{it}\color{red}}+\\ @@ -211,8 +211,8 @@ Er fa{\ss}t ihn sicher, er h\"alt ihn warm. Et voici le code \LaTeX{} correspondant ; le premier argument de \verb+\lettrine+ \'etant \verb+W+, \verb+\lettrine+ fait appel au fichier \verb+W.eps+ en \LaTeX{} -ou \`a \verb+W.pdf+, \verb+W.jpg+, etc. en pdf\LaTeX{} (omission -possible du suffixe \verb+.eps+, \verb+.pdf+, propri\'et\'e de +ou \`a \verb+W.pdf+, \verb+W.jpg+, etc. en pdf\LaTeX{} (omission +possible du suffixe \verb+.eps+, \verb+.pdf+, propri\'et\'e de \verb+graphicx.sty+) ; \begin{verbatim} @@ -236,7 +236,7 @@ Cet exemple fait appel aux fichiers suivants : disponibles sur CTAN). \end{itemize} L'initiale gothique \og W \fg{} utilis\'ee dans -cet exemple a \'et\'e cr\'e\'ee par \MP{} (fichier \verb+W.eps+ ci-joint) +cet exemple a \'et\'e cr\'e\'ee par \MP{} (fichier \verb+W.eps+ ci-joint) \`a partir du source \MF{} \verb+yinitW.mf+ de Yannis gr\^ace aux pr\'ecieuses indications de Denis~\textsc{Roegel} que je remercie bien vivement. @@ -257,7 +257,7 @@ guise de lettrines. \end{document} -%%% Local Variables: +%%% Local Variables: %%% mode: latex %%% TeX-master: t -%%% End: +%%% End: diff --git a/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf b/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf index 33e78df9b9f..60a26b30616 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 5fc747abf78..acbf9274d68 100644 --- a/Master/texmf-dist/source/latex/lettrine/lettrine.dtx +++ b/Master/texmf-dist/source/latex/lettrine/lettrine.dtx @@ -1,9 +1,9 @@ % -% \CheckSum{448} +% \CheckSum{464} % % \iffalse meta-comment % -% Copyright (C) 1999-2013 Daniel Flipo. +% Copyright (C) 1999-2014 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 @@ -30,12 +30,12 @@ \ProvidesFile{lettrine.dtx} % %<*!cfg> - [2013/03/14 v1.64 (Daniel Flipo)] + [2014/09/04 v1.65 (Daniel Flipo)] % % % Lettrine package for LaTeX version 2e % -% Copyright (C) 1999-2012 by Daniel Flipo +% Copyright (C) 1999-2014 by Daniel Flipo % % Please report errors to: daniel.flipo at free.fr % @@ -152,6 +152,9 @@ % Another possibility to colour lettrines globally is described % below, see |\LettrineFontHook|. % +% Three dimensions, |\LettrineWidth|, |\LettrineHeight| and +% |\LettrineDepth|, store the final size of the lettrine. +% % Once \file{lettrine.sty} will be installed (run \texttt{latex} % on \file{lettrine.ins} to extract it), compile and print % \file{demo.tex} to see the possible usage of these parameters. @@ -181,13 +184,9 @@ % \file{contrib}. % % The dimensional parameters |findent|, |nindent| and |slope|, -% can be set in \textit{filename} relative to |\LettrineWidth| -% if needed. -% |\LettrineWidth| should be used \emph{only} in the config file -% \textit{filename}, its value is non-null only if \textit{filename} -% is read! -% The settings read from this file will be overridden by the -% optional arguments eventually given to |\lettrine|. +% can be set in \textit{filename} relative to |\LettrineWidth| if +% needed. The settings read from this file will be overridden by +% the optional arguments eventually given to |\lettrine|. % % |\LettrineTextFont| sets the font used for the second argument % of |\lettrine|, its default definition is @@ -473,6 +472,8 @@ % \begin{macrocode} \newcommand*{\LettrineOptionsFor}[2]{\@namedef{l@#1-keys}{#2}} \newdimen\LettrineWidth +\newdimen\LettrineHeight +\newdimen\LettrineDepth % \end{macrocode} % \end{macro} % @@ -546,7 +547,7 @@ % measuring the lettrine for |\LettrineWidth| to be set properly. % \begin{macrocode} \sbox{\L@lbox}{\LettrineFont #2}% - \settowidth{\LettrineWidth}{\usebox{\L@lbox}}% + \setlength{\LettrineWidth}{\wd\L@lbox}% \def\KV@prefix{KV@L@}% \let\@tempc\relax \expandafter\KV@do\l@LOKeys,\relax, @@ -653,6 +654,13 @@ \addtolength{\L@Pindent}{\rightmargin}% \addtolength{\L@Nindent}{\rightmargin}% % \end{macrocode} +% \changes{lettrine-1.65}{2014/09/04}{Measure and store the lettrine's +% final dimensions.} +% \begin{macrocode} + \setlength{\LettrineWidth}{\wd\L@lbox}% + \setlength{\LettrineHeight}{\ht\L@lbox}% + \setlength{\LettrineDepth}{\dp\L@lbox}% +% \end{macrocode} % Now, set up the shape of the new paragraph (designed by % |\parshape|). % \begin{macrocode} @@ -675,12 +683,13 @@ % the rest of paragraph around it. % \begin{macrocode} \smash{\llap{\mbox{\L@ante}\raisebox{\L@lraise}{\usebox{\L@lbox}}% - \hskip \the\L@Findent}}% - \usebox{\L@tbox}} + \hskip \the\L@Findent}}% + \usebox{\L@tbox}% +} % \end{macrocode} % \end{macro} +% This ends the definition of |\lettrine|. % -% This ends the definition of |\lettrine|.\\ % Load a local config file if present in \LaTeX{}'s search path. % \begin{macrocode} \InputIfFileExists{lettrine.cfg} diff --git a/Master/texmf-dist/source/latex/lettrine/lettrine.ins b/Master/texmf-dist/source/latex/lettrine/lettrine.ins index 389367d2075..ac7289deba3 100644 --- a/Master/texmf-dist/source/latex/lettrine/lettrine.ins +++ b/Master/texmf-dist/source/latex/lettrine/lettrine.ins @@ -1,14 +1,14 @@ %% -%% Copyright (C) 1999-2013 Daniel Flipo. +%% Copyright (C) 1999-2014 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 +%% 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. @@ -33,7 +33,7 @@ \keepsilent -\usedir{tex/latex/lettrine} +\usedir{tex/latex/lettrine} \generate{\file{lettrine.sty}{\from{lettrine.dtx}{sty}} } diff --git a/Master/texmf-dist/tex/latex/lettrine/lettrine.sty b/Master/texmf-dist/tex/latex/lettrine/lettrine.sty index a58b64b84f9..11e7ca24b80 100644 --- a/Master/texmf-dist/tex/latex/lettrine/lettrine.sty +++ b/Master/texmf-dist/tex/latex/lettrine/lettrine.sty @@ -22,7 +22,7 @@ %% in the same archive or directory.) \NeedsTeXFormat{LaTeX2e}[1999/12/01] \ProvidesFile{lettrine.sty} - [2013/03/14 v1.64 (Daniel Flipo)] + [2014/09/04 v1.65 (Daniel Flipo)] \NeedsTeXFormat{LaTeX2e}[1999/12/01] \RequirePackage{keyval} \newcounter{DefaultLines} @@ -100,6 +100,8 @@ \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}% @@ -133,7 +135,7 @@ \let\@tempc\relax \expandafter\KV@do\l@LOKeys,\relax, \sbox{\L@lbox}{\LettrineFont #2}% - \settowidth{\LettrineWidth}{\usebox{\L@lbox}}% + \setlength{\LettrineWidth}{\wd\L@lbox}% \def\KV@prefix{KV@L@}% \let\@tempc\relax \expandafter\KV@do\l@LOKeys,\relax, @@ -175,6 +177,9 @@ \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@ @@ -187,8 +192,9 @@ \noindent \parshape=\L@parshape\relax \smash{\llap{\mbox{\L@ante}\raisebox{\L@lraise}{\usebox{\L@lbox}}% - \hskip \the\L@Findent}}% - \usebox{\L@tbox}} + \hskip \the\L@Findent}}% + \usebox{\L@tbox}% +} \InputIfFileExists{lettrine.cfg} {\typeout{Loading lettrine.cfg}} {\typeout{lettrine.cfg not found, using default values}} diff --git a/Master/texmf-dist/tex/latex/lettrine/pacl.cfl b/Master/texmf-dist/tex/latex/lettrine/pacl.cfl index 07644712ea3..a7c122313fa 100644 --- a/Master/texmf-dist/tex/latex/lettrine/pacl.cfl +++ b/Master/texmf-dist/tex/latex/lettrine/pacl.cfl @@ -2,11 +2,11 @@ %%% It is provided under the LPPL. Copyright is hold by Pascal Kockaert. %%% If you modify this file you *MUST* change its name. %%% -%%% This file contains config values to simplify the use of the -%%% ACaslon-SwashItalic (aka pacri8s) font from Adobe +%%% This file contains config values to simplify the use of the +%%% ACaslon-SwashItalic (aka pacri8s) font from Adobe %%% with the lettrine package by Daniel Flipo. %%% -%%% If you want to use this file, your document should contain +%%% If you want to use this file, your document should contain %%% the two next lines, without the leading percent signs. %%% \renewcommand\LettrineFontHook{\fontencoding{T1}\fontfamily{pacl}\selectfont} %%% \renewcommand{\DefaultOptionsFile}{pacl.cfl} @@ -14,9 +14,9 @@ %%% The fontfamily pacl is defined through the file T1pacl.fd. %%% The contents of T1pacl.fd is listed at the end of this file. %%% -%%% The settings below were defined according to my visual tastes. -%%% No mathematical rule based on the metrices was applied. -%%% Though the result may not please you, it should be better +%%% The settings below were defined according to my visual tastes. +%%% No mathematical rule based on the metrices was applied. +%%% Though the result may not please you, it should be better %%% than the default placement. This said, comments are welcome. %%% %%% Comments about this file can be sent to Pascal.Kockaert @@ -30,34 +30,34 @@ \LettrineOptionsFor{D}{loversize= 0.15,lraise= 0.00,lhang= 0.20,findent=-0.07\LettrineWidth,nindent= 0.50em} \LettrineOptionsFor{E}{loversize= 0.15,lraise= 0.00,lhang= 0.05,findent=-0.10\LettrineWidth,nindent= 0.50em} \LettrineOptionsFor{F}{loversize=-0.10,lraise= 0.20,lhang= 0.00,findent= 0.05\LettrineWidth,nindent= 0.50em} -\LettrineOptionsFor{G}{loversize=-0.10,lraise= 0.20,lhang= 0.05,findent=-0.05\LettrineWidth,nindent= 0.50em} -\LettrineOptionsFor{H}{loversize= 0.05,lraise= 0.00,lhang= 0.25,findent= 0.00\LettrineWidth,nindent= 0.50em} -\LettrineOptionsFor{I}{loversize= 0.15,lraise= 0.00,lhang= 0.00,findent= 0.00\LettrineWidth,nindent= 0.50em} -\LettrineOptionsFor{J}{loversize=-0.10,lraise= 0.20,lhang= 0.00,findent= 0.00\LettrineWidth,nindent= 0.50em} -\LettrineOptionsFor{K}{loversize=-0.10,lraise= 0.25,lhang= 0.00,findent= 0.00\LettrineWidth,nindent= 0.45\LettrineWidth} -\LettrineOptionsFor{L}{loversize= 0.00,lraise= 0.20,lhang= 0.00,findent=-0.10\LettrineWidth,nindent= 0.40\LettrineWidth} -\LettrineOptionsFor{M}{loversize= 0.15,lraise= 0.00,lhang= 0.24,findent=-0.05\LettrineWidth,nindent= 0.10\LettrineWidth} -\LettrineOptionsFor{N}{loversize=-0.05,lraise= 0.25,lhang= 0.13,findent= 0.05\LettrineWidth,nindent= 0.35\LettrineWidth} -\LettrineOptionsFor{O}{loversize= 0.15,lraise= 0.00,lhang= 0.05,findent=-0.12\LettrineWidth,nindent= 0.15\LettrineWidth} -\LettrineOptionsFor{P}{loversize= 0.15,lraise= 0.00,lhang= 0.25,findent= 0.00\LettrineWidth,nindent= 0.50em} -\LettrineOptionsFor{Q}{loversize=-0.15,lraise= 0.25,lhang= 0.10,findent=-0.05\LettrineWidth,nindent= 0.55\LettrineWidth} -\LettrineOptionsFor{R}{loversize=-0.15,lraise= 0.25,lhang= 0.20,findent=-0.05\LettrineWidth,nindent= 0.45\LettrineWidth} -\LettrineOptionsFor{S}{loversize=-0.10,lraise= 0.25,lhang=-0.05,findent=-0.05\LettrineWidth,nindent= 0.50em} -\LettrineOptionsFor{T}{loversize= 0.15,lraise= 0.00,lhang= 0.15,findent= 0.00\LettrineWidth,nindent= 0.15\LettrineWidth} -\LettrineOptionsFor{U}{loversize= 0.15,lraise= 0.00,lhang= 0.05,findent= 0.00\LettrineWidth,nindent= 0.50em} -\LettrineOptionsFor{V}{loversize= 0.15,lraise= 0.00,lhang= 0.20,findent=-0.05\LettrineWidth,nindent= 0.50em} -\LettrineOptionsFor{W}{loversize= 0.15,lraise= 0.00,lhang= 0.15,findent=-0.05\LettrineWidth,nindent= 0.50em} -\LettrineOptionsFor{X}{loversize= 0.15,lraise= 0.00,lhang= 0.45,findent= 0.05\LettrineWidth,nindent= 0.15\LettrineWidth} -\LettrineOptionsFor{Y}{loversize= 0.15,lraise= 0.00,lhang= 0.05,findent= 0.20\LettrineWidth,nindent= 0.25\LettrineWidth} -\LettrineOptionsFor{Z}{loversize= 0.05,lraise= 0.15,lhang= 0.15,findent= 0.00\LettrineWidth,nindent= 0.30\LettrineWidth} -\endinput - +\LettrineOptionsFor{G}{loversize=-0.10,lraise= 0.20,lhang= 0.05,findent=-0.05\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{H}{loversize= 0.05,lraise= 0.00,lhang= 0.25,findent= 0.00\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{I}{loversize= 0.15,lraise= 0.00,lhang= 0.00,findent= 0.00\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{J}{loversize=-0.10,lraise= 0.20,lhang= 0.00,findent= 0.00\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{K}{loversize=-0.10,lraise= 0.25,lhang= 0.00,findent= 0.00\LettrineWidth,nindent= 0.45\LettrineWidth} +\LettrineOptionsFor{L}{loversize= 0.00,lraise= 0.20,lhang= 0.00,findent=-0.10\LettrineWidth,nindent= 0.40\LettrineWidth} +\LettrineOptionsFor{M}{loversize= 0.15,lraise= 0.00,lhang= 0.24,findent=-0.05\LettrineWidth,nindent= 0.10\LettrineWidth} +\LettrineOptionsFor{N}{loversize=-0.05,lraise= 0.25,lhang= 0.13,findent= 0.05\LettrineWidth,nindent= 0.35\LettrineWidth} +\LettrineOptionsFor{O}{loversize= 0.15,lraise= 0.00,lhang= 0.05,findent=-0.12\LettrineWidth,nindent= 0.15\LettrineWidth} +\LettrineOptionsFor{P}{loversize= 0.15,lraise= 0.00,lhang= 0.25,findent= 0.00\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{Q}{loversize=-0.15,lraise= 0.25,lhang= 0.10,findent=-0.05\LettrineWidth,nindent= 0.55\LettrineWidth} +\LettrineOptionsFor{R}{loversize=-0.15,lraise= 0.25,lhang= 0.20,findent=-0.05\LettrineWidth,nindent= 0.45\LettrineWidth} +\LettrineOptionsFor{S}{loversize=-0.10,lraise= 0.25,lhang=-0.05,findent=-0.05\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{T}{loversize= 0.15,lraise= 0.00,lhang= 0.15,findent= 0.00\LettrineWidth,nindent= 0.15\LettrineWidth} +\LettrineOptionsFor{U}{loversize= 0.15,lraise= 0.00,lhang= 0.05,findent= 0.00\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{V}{loversize= 0.15,lraise= 0.00,lhang= 0.20,findent=-0.05\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{W}{loversize= 0.15,lraise= 0.00,lhang= 0.15,findent=-0.05\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{X}{loversize= 0.15,lraise= 0.00,lhang= 0.45,findent= 0.05\LettrineWidth,nindent= 0.15\LettrineWidth} +\LettrineOptionsFor{Y}{loversize= 0.15,lraise= 0.00,lhang= 0.05,findent= 0.20\LettrineWidth,nindent= 0.25\LettrineWidth} +\LettrineOptionsFor{Z}{loversize= 0.05,lraise= 0.15,lhang= 0.15,findent= 0.00\LettrineWidth,nindent= 0.30\LettrineWidth} +\endinput + % The installation of the pacl family can be performed using the fontinst package. % You must own the font ACaslon-SwashItalic, that is an AFM and a PFB file % which should be renamed as padri8w.afm and padri8w.pfb. % -% You should process the file Makepacl.tex (see below) through TeX, +% You should process the file Makepacl.tex (see below) through TeX, % and follow the instructions of the fontinst manual to finish the install. % The file T1pacl.fd should be defined as below and put with other local FD files. diff --git a/Master/texmf-dist/tex/latex/lettrine/padl.cfl b/Master/texmf-dist/tex/latex/lettrine/padl.cfl index 72eaeb60540..784bebc935e 100644 --- a/Master/texmf-dist/tex/latex/lettrine/padl.cfl +++ b/Master/texmf-dist/tex/latex/lettrine/padl.cfl @@ -2,11 +2,11 @@ %%% It is provided under the LPPL. Copyright is hold by Pascal Kockaert. %%% If you modify this file you *MUST* change its name. %%% -%%% This file contains config values to simplify the use of the -%%% AGaramondAlt-Italic (aka padri8w) font from Adobe +%%% This file contains config values to simplify the use of the +%%% AGaramondAlt-Italic (aka padri8w) font from Adobe %%% with the lettrine package by Daniel Flipo. %%% -%%% If you want to use this file, your document should contain +%%% If you want to use this file, your document should contain %%% the two next lines, without the leading percent signs. %%% \renewcommand\LettrineFontHook{\fontencoding{T1}\fontfamily{padl}\selectfont} %%% \renewcommand{\DefaultOptionsFile}{padl.cfl} @@ -14,9 +14,9 @@ %%% The fontfamily padl is defined through the file T1padl.fd. %%% The contents of T1padl.fd is listed at the end of this file. %%% -%%% The settings below were defined according to my visual tastes. -%%% No mathematical rule based on the metrices was applied. -%%% Though the result may not please you, it should be better +%%% The settings below were defined according to my visual tastes. +%%% No mathematical rule based on the metrices was applied. +%%% Though the result may not please you, it should be better %%% than the default placement. This said, comments are welcome. %%% %%% Comments about this file can be sent to Pascal.Kockaert @@ -41,7 +41,7 @@ \LettrineOptionsFor{M}{loversize= 0.10,lraise= 0.00,lhang= 0.40,findent= 0.040\LettrineWidth,nindent= 0.10\LettrineWidth} \LettrineOptionsFor{N}{loversize= 0.00,lraise= 0.20,lhang= 0.20,findent=-0.010\LettrineWidth,nindent= 0.40\LettrineWidth} \LettrineOptionsFor{O}{loversize= 0.10,lraise= 0.00,lhang= 0.20,findent=-0.010\LettrineWidth,nindent= 0.50em} -\LettrineOptionsFor{P}{loversize= 0.10,lraise= 0.00,lhang= 0.30,findent= 0.050\LettrineWidth,nindent= 0.50em} +\LettrineOptionsFor{P}{loversize= 0.10,lraise= 0.00,lhang= 0.30,findent= 0.050\LettrineWidth,nindent= 0.50em} \LettrineOptionsFor{Q}{loversize= 0.00,lraise= 0.20,lhang= 0.20,findent= 0.050\LettrineWidth,nindent= 0.70\LettrineWidth} \LettrineOptionsFor{R}{loversize=-0.05,lraise= 0.25,lhang= 0.25,nindent= 0.500\LettrineWidth,nindent= 0.50\LettrineWidth} \LettrineOptionsFor{S}{loversize= 0.10,lraise= 0.05,lhang= 0.00,findent= 0.000\LettrineWidth,nindent= 0.50em} @@ -59,7 +59,7 @@ % You must own the font AGaramondAlt-Italic, that is an AFM and a PFB file % which should be renamed as padri8w.afm and padri8w.pfb. % -% You should process the file Makepadl.tex (see below) through TeX, +% You should process the file Makepadl.tex (see below) through TeX, % and follow the instructions of the fontinst manual to finish the install. % The file T1padl.fd should be defined as below and put with other local FD files. diff --git a/Master/texmf-dist/tex/latex/lettrine/pzc2.cfl b/Master/texmf-dist/tex/latex/lettrine/pzc2.cfl index 114574026ff..77799687805 100644 --- a/Master/texmf-dist/tex/latex/lettrine/pzc2.cfl +++ b/Master/texmf-dist/tex/latex/lettrine/pzc2.cfl @@ -2,11 +2,11 @@ %%% 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 +%%% 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 +%%% 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} @@ -16,30 +16,30 @@ %%% (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} +\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 -- cgit v1.2.3