summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2020-03-26 21:28:05 +0000
committerKarl Berry <karl@freefriends.org>2020-03-26 21:28:05 +0000
commitfd3d22c6b9915762a007942b0617c39f8bd6fcdc (patch)
treec1e065c23e999487e46036dea3a6e7838477c4fa
parente5b867c8ebe58caa2dae444265723e8a88603b1f (diff)
lettrine (26mar20)
git-svn-id: svn://tug.org/texlive/trunk@54560 c570f23f-e606-0410-a88d-b1316a301751
-rw-r--r--Master/texmf-dist/doc/latex/lettrine/README.md (renamed from Master/texmf-dist/doc/latex/lettrine/README)50
-rw-r--r--Master/texmf-dist/doc/latex/lettrine/demo-de.pdfbin136266 -> 57807 bytes
-rw-r--r--Master/texmf-dist/doc/latex/lettrine/demo-de.tex68
-rw-r--r--Master/texmf-dist/doc/latex/lettrine/demo-fr.pdfbin0 -> 62734 bytes
-rw-r--r--Master/texmf-dist/doc/latex/lettrine/demo-fr.tex (renamed from Master/texmf-dist/doc/latex/lettrine/demo.tex)90
-rw-r--r--Master/texmf-dist/doc/latex/lettrine/demo-lua.pdfbin0 -> 74166 bytes
-rw-r--r--Master/texmf-dist/doc/latex/lettrine/demo-lua.tex116
-rw-r--r--Master/texmf-dist/doc/latex/lettrine/demo.pdfbin144777 -> 0 bytes
-rw-r--r--Master/texmf-dist/doc/latex/lettrine/lettrine.pdfbin123998 -> 89941 bytes
-rw-r--r--Master/texmf-dist/source/latex/lettrine/contrib.dtx4
-rw-r--r--Master/texmf-dist/source/latex/lettrine/contrib.ins2
-rw-r--r--Master/texmf-dist/source/latex/lettrine/lettrine.dtx284
-rw-r--r--Master/texmf-dist/source/latex/lettrine/lettrine.ins2
-rw-r--r--Master/texmf-dist/tex/latex/lettrine/lettrine.sty6
-rw-r--r--Master/texmf-dist/tex/latex/lettrine/optfile.cfl4
15 files changed, 381 insertions, 245 deletions
diff --git a/Master/texmf-dist/doc/latex/lettrine/README b/Master/texmf-dist/doc/latex/lettrine/README.md
index c5e5f062bd0..73d10c67737 100644
--- a/Master/texmf-dist/doc/latex/lettrine/README
+++ b/Master/texmf-dist/doc/latex/lettrine/README.md
@@ -1,34 +1,50 @@
- Lettrine bundle
+The Lettrine bundle
+===================
-This bundle contains a package that I maintain to typeset dropped
-capitals in a LaTeX document.
+Description
+-----------
-It is subject to the LaTeX Project Public License.
+This package is meant for typesetting dropped capitals in LaTeX documents.
+
+Documentation
+-------------
+
+Have a look at one of the PDF files, demo-fr.pdf (in French),
+demo-de.pdf (in German) or demo-lua.pdf 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.
+
+Have a look at lettrine.pdf in the doc directory, if you are interested
+in the complete documentation and code.
+
+If you wish, you can customize lettrine.cfg according to your needs.
+
+License
+-------
+
+Released under the LaTeX Project Public License v1.3 or later
See http://www.latex-project.org/lppl.txt
for the details of that license.
-Installation: this bundle is included in most TeX distributions, but
-if you need to install it by yourself
+Installation
+------------
+
+This bundle is included in most TeX distributions, but if you need
+to install it by yourself
1. run lualatex on lettrine.dtx to get the documentation (lettrine.pdf),
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, 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
$TEXMF/source/latex/lettrine
-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
-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.
-
--
-Daniel Flipo, <daniel.flipo@free.fr>
-August, 25th, 2018.
+Copyright 1999--2020 Daniel Flipo
+E-mail: daniel (dot) flipo (at) free (dot) fr
diff --git a/Master/texmf-dist/doc/latex/lettrine/demo-de.pdf b/Master/texmf-dist/doc/latex/lettrine/demo-de.pdf
index 069a6e86407..3c7102a8985 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-de.tex b/Master/texmf-dist/doc/latex/lettrine/demo-de.tex
index a5fabafa065..204841e854f 100644
--- a/Master/texmf-dist/doc/latex/lettrine/demo-de.tex
+++ b/Master/texmf-dist/doc/latex/lettrine/demo-de.tex
@@ -1,22 +1,25 @@
-%Format: pdfLaTeX
-\documentclass[12pt,a4paper]{article}
+\documentclass[a4paper,12pt,german]{article}
+\usepackage{iftex}
+\iftutex
+ \usepackage{fontspec}
+ \setmainfont{erewhon} % erewhon (Utopia)
+\else
+ \usepackage{fourier} % fourier (Utopia) und
+ \renewcommand{\ttdefault}{lmtt} % Latin Modern Typewriter fonts
+\fi
\usepackage[a4paper,text={150mm,240mm},centering]{geometry}
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{palatino} % Palatino und
-\renewcommand{\ttdefault}{lmtt} % Latin Modern Typewriter fonts
\usepackage{microtype}
\usepackage{lettrine}
\usepackage{graphicx,color}
\usepackage{lettrine}
-\usepackage{german}
+\usepackage{babel}
-\newcommand{\MF}{{\small\sffamily\scshape metafont}}
-\newcommand{\MP}{{\small\sffamily\scshape metapost}}
+\newcommand{\MF}{{\small\scshape metafont}}
+\newcommand{\MP}{{\small\scshape metapost}}
\setlength{\parindent}{0pt}
\sloppy
\begin{document}
@@ -55,11 +58,11 @@ beeinflusst.
\vspace{\baselineskip}
\textit{Initiale vollständig im Randbereich} :\\
-\verb+\lettrine[lhang=1, nindent=0pt, lines=3]{V}{erschieben}+
+\verb+\lettrine[lhang=1,findent= .3em,nindent=0pt,lines=3]{V}{erschieben}+
-\lettrine[lhang=1, nindent=0pt, lines=3]{V}{erschieben} wir nun im vierten
-Beispiel die Initiale in den Randbereich. Dieses Verhalten wird durch den
-Parameter \verb+lhang= + gesteuert.
+\lettrine[lhang=1,findent= .3em,nindent=0pt,lines=3]{V}{erschieben}
+wir nun im vierten Beispiel die Initiale in den Randbereich.
+Dieses Verhalten wird durch den Parameter \verb+lhang= + gesteuert.
\vspace{\baselineskip}
\textit{Initiale, vergrössert und teilweise im Randbereich} :\\
@@ -91,10 +94,10 @@ wohl nur Anführungszeichen dafür in Frage kommen.
\newpage
\textit{Wir verkleinern die Initiale nun um 10\% und heben sie
-um 10\% wegen des {\glqq}Q{\grqq}}
-\verb+\lettrine[lines=4, loversize=-.1, lraise=.1]{Q}{ualität}+
+um 15\% wegen des {\glqq}Q{\grqq}}:\\
+\verb+\lettrine[lines=4, loversize=-.15, lraise=.15]{Q}{ualität}+
-\lettrine[lines=4, loversize=-.1, lraise=.1]{Q}{ualität} hat ihren
+\lettrine[lines=4, loversize=-.15, lraise=.15]{Q}{ualität} hat ihren
Preis. Und wenn es nur die Zeit ist, um zu lernen wie Sie solche Spielereien
anstellen können. Bei den Ergebnissen lohnt sich aber die Mühe. Welche
Parameter diesmal was beeinflussen, lasse ich Sie nun selbst herausfinden.
@@ -130,24 +133,24 @@ bietet auch das {\glqq}V{\grqq} keine Schwierigkeiten mehr. Wie das beim
der Neigung des {\ttfamily\upshape V} folgt; Das {\ttfamily\upshape V} ragt
zusätzlich halb in den Rand hinein
(Option {\ttfamily\upshape lhang=0.5} :})\\
-\verb+\lettrine[lines=4, slope=-0.5em, lhang=0.5, nindent=0pt]+\\
+\verb+\lettrine[lines=4, slope=-0.5em, lhang=0.5, findent=.5em,nindent=0pt]+\\
\verb+ {V}{iel} ist...+
-\lettrine[lines=4, slope=-0.5em, lhang=0.5, nindent=0pt]{V}{iel} ist hier
-nicht anders. Nur die negative Neigung und das Hereinragen in den Rand. Ob
-Ihnen das Ergebnis gefällt müssen Sie selber entscheiden. Sie sehen aber,
-das das {\glqq}V{\grqq} wirklich keine Schwierigkeiten bietet. Der Unterschied
-zum vorhergehenden Beispiel ist nicht besonders gross.
+\lettrine[lines=4, slope=-0.5em, lhang=0.5, findent=.5em, nindent=0pt]{V}{iel}
+ist hier nicht anders. Nur die negative Neigung und das Hereinragen in den
+Rand. Ob Ihnen das Ergebnis gefällt müssen Sie selber entscheiden.
+Sie sehen aber, das das {\glqq}V{\grqq} wirklich keine Schwierigkeiten bietet.
+Der Unterschied zum vorhergehenden Beispiel ist nicht besonders gross.
\vspace{.5\baselineskip}
\textit{Ändern wir nun die Schriftfamilie für die Initiale
(hier AvantGarde bold italique):}\\
-\verb+\renewcommand{\LettrineFontHook}{\fontfamily{pag}%+\\
+\verb+\renewcommand{\LettrineFontHook}{\fontfamily{pag}\fontencoding{T1}%+\\
\verb+ \fontseries{bx}\fontshape{it}}+\\
\verb+\lettrine[findent=.3em]{A}{uch} ein Wechsel...+
{% (Ändern des lokalen fonts)
-\renewcommand{\LettrineFontHook}{\fontfamily{pag}\fontseries{bx}\fontshape{it}}
+\renewcommand{\LettrineFontHook}{\fontfamily{pag}\fontencoding{T1}\fontseries{bx}\fontshape{it}}
\lettrine[findent=.3em]{A}{uch} ein Wechsel der Schriftfamilie ist problemlos
möglich. Hier verwenden wir Avantgarde und setzen mit der Option
@@ -157,11 +160,12 @@ möglich. Hier verwenden wir Avantgarde und setzen mit der Option
\vspace{.5\baselineskip}
\textit{Ändern wir nun die Schriftfamilie und die Farbe für die Initiale
(hier yfrak in Grau) :}\\
-\verb+\renewcommand{\LettrineFontHook}{\fontfamily{yfrak}\color[gray]{0.5}}+\\
-\verb+\lettrine[loversize=0.1]{A}{uch}...+
+\verb+\renewcommand{\LettrineFontHook}{\fontfamily{yfrak}\fontencoding{T1}+\\
+\verb+ \color[gray]{0.5}}\lettrine[loversize=0.1]{A}{uch}...+
{% (Aendern des lokalen fonts)
-\renewcommand{\LettrineFontHook}{\fontfamily{yfrak}\color[gray]{0.5}}
+\renewcommand{\LettrineFontHook}{\fontfamily{yfrak}\fontencoding{T1}
+ \color[gray]{0.5}}
\lettrine[loversize=0.1]{A}{uch} ein Wechsel der
Schriftfamilie ist problemlos möglich. Hier verwenden wir yfrak,
@@ -181,14 +185,14 @@ die Boolsche Variable \texttt{image=true} zu benützen; z.B. so:
\vspace{.5\baselineskip}
{% Gruppierung, um die LOKALEN Definitionen zu schützen
-\fontfamily{yfrak}\selectfont\Large
+\fontfamily{yfrak}\fontencoding{T1}\selectfont\Large
\renewcommand{\LettrineTextFont}{\relax}
\lettrine[image=true, lines=3, lhang=.2, loversize=.25, %
lraise=-.05, findent=0.1em, nindent=0em]
{W}{er} reitet so spät durch Nacht und Wind?\\
Es ist der Vater mit seinem Kind;\\
Er hat den Knaben wohl in dem Arm,\\
-Er faßt ihn sicher, er hält ihn warm.
+Er fa{\ss}t ihn sicher, er hält ihn warm.
\par}
\vspace{\baselineskip} Und hier der zum Beispiel gehörende \LaTeX{}--Code:
@@ -197,14 +201,14 @@ lädt dann die Datei \verb+W.eps+. Das Suffix \verb+.eps+ kann -- dank des
Pakets \verb+graphicx.sty+ -- weggelassen werden.
\begin{verbatim}
-{\fontfamily{yfrak}\selectfont\Large
+{\fontfamily{yfrak}\fontencoding{T1}\selectfont\Large
\renewcommand{\LettrineTextFont}{\relax}
\lettrine[image=true, lines=3, lhang=.2, loversize=.25, %
lraise=-.05, findent=0.1em, nindent=0em]
{W}{er} reitet so spät durch Nacht und Wind?
Es ist der Vater mit seinem Kind;
Er hat den Knaben wohl in dem Arm,
-Er faßt ihn sicher, er hält ihn warm.\par}
+Er fa{\ss}t ihn sicher, er hält ihn warm.\par}
\end{verbatim}
Zur Darstellung dieses Beispiels müssen folgende Pakete installiert sein:
@@ -235,5 +239,7 @@ in eine PDF-Datei \verb+W.pdf+ umwandeln (mit Hilfe von \verb+epstopdf+).
%%% Local Variables:
%%% mode: latex
+%%% coding: utf-8
%%% TeX-master: t
+%%% TeX-engine: xetex
%%% End:
diff --git a/Master/texmf-dist/doc/latex/lettrine/demo-fr.pdf b/Master/texmf-dist/doc/latex/lettrine/demo-fr.pdf
new file mode 100644
index 00000000000..dc308808609
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/lettrine/demo-fr.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/lettrine/demo.tex b/Master/texmf-dist/doc/latex/lettrine/demo-fr.tex
index 705f9272c3b..21e525ed061 100644
--- a/Master/texmf-dist/doc/latex/lettrine/demo.tex
+++ b/Master/texmf-dist/doc/latex/lettrine/demo-fr.tex
@@ -1,24 +1,27 @@
-%Format: pdfLaTeX
-\documentclass[12pt,german,french]{article}
-
-\usepackage[a4paper,text={145mm,240mm},centering]{geometry}
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
-\usepackage{palatino} % Romain (sans-serif= helvetica)
-\renewcommand{\ttdefault}{lmtt} % Courier chasse trop !
+\documentclass[paper=a4,12pt,german,french]{scrartcl}
+\usepackage{iftex}
+\iftutex
+ \usepackage{fontspec}
+ \setmainfont{erewhon}
+\else
+ \usepackage[utf8]{inputenc}
+ \usepackage{fourier}
+ \renewcommand{\ttdefault}{lmtt} % Courier chasse trop !
+\fi
\usepackage{microtype}
\usepackage{Rothdn, Typocaps} % cfr-initials (p. 3)
+\usepackage{graphicx,color}
\usepackage{lettrine}
\usepackage{babel}
\frenchbsetup{AutoSpacePunctuation=false,og=«,fg=»}
-\usepackage{graphicx,color}
-\usepackage{hyperref,bookmark}
+\newcommand*{\MF}{{\small\scshape metafont}}
+\newcommand*{\MP}{{\small\scshape metapost}}
+\newcommand*{\file}[1]{\texttt{#1}}
+\newcommand*{\cs}[1]{\texttt{\boi#1}}
-\newcommand{\MF}{{\small\sffamily\scshape metafont}}
-\newcommand{\MP}{{\small\sffamily\scshape metapost}}
\setlength{\parindent}{0pt}
\sloppy
\begin{document}
@@ -35,8 +38,7 @@
\lettrine{E}{n} plein 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,
-l'une des « abbayes de sel» dont il ne reste que quelques vestiges.
+terrestre de la ville fortifiée, celle qui menait à Psalmody.
\vspace{\baselineskip}
\textit{Lettrine sur une seule ligne (option {\ttfamily\upshape lines=1}) :}\\
@@ -79,8 +81,7 @@ plein marais de la Souteyranne,
à quelques kilomètres au nord d'Aigues-Mortes 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,
-l'une des « abbayes de sel» \dots
-% dont il ne reste que des vestiges.
+l'une des « abbayes de sel» dont il ne reste que des vestiges.
\vspace{\baselineskip}
\textit{On peut ajouter un guillemet devant la lettrine} :\\
@@ -90,9 +91,7 @@ l'une des « abbayes de sel» \dots
à 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,
-l'une des « abbayes de sel» \dots
-% dont il ne reste que des vestiges.
+terrestre de la ville fortifiée, celle qui menait à Psalmody.
\newpage
Toutes Les lettrines suivantes seront en gris jusqu'à nouvel ordre : \\
@@ -123,7 +122,7 @@ se trouve la Tour Carbonnière, surprend les visiteurs.
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,
l'une des « abbayes de sel» dont il ne reste que quelques vestiges.
-L'abbaye était ravitaillée par un souterrain qui
+L'abbaye était ravitaillée ---~dit-on~--- par un souterrain qui
la reliait au château de Treillan.
\vspace{.5\baselineskip}
@@ -144,19 +143,18 @@ la reliait au château de Treillan.
\textit{Utilisation de l'option {\ttfamily\upshape slope} pour que le texte
suive la pente du {\ttfamily\upshape V}, noter que celui-ci est à
demi-poussé dans la marge par l'option {\ttfamily\upshape lhang=0.5} :}\\
-\verb+\lettrine[lines=4, slope=-0.5em, lhang=0.5, nindent=0pt]+\\
+\verb+\lettrine[lines=4, slope=-0.5em, lhang=0.5, findent=.5em, nindent=0pt]+\\
\verb+ {V}{oici} à...+
-\lettrine[lines=4, slope=-0.5em, lhang=0.5, nindent=0pt]{V}{oici}
+\lettrine[lines=4, slope=-0.5em, lhang=0.5, findent=.5em, nindent=0pt]{V}{oici}
à quelques kilomètres au nord d'Aigues-Mortes 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,
l'une des « abbayes de sel» dont il ne reste que quelques vestiges.
L'abbaye était ravitaillée ---~dit-on~--- par un souterrain qui
-la reliait au château de Treillan.
+la reliait au château de Treillan distant de quelques kilomètres à peine.
\newpage
-\newgeometry{text={138mm,240mm},centering}
\begin{center}
\large\bfseries Deux exemples d’utilisation de cfr-initials
@@ -187,19 +185,20 @@ terrestre de la ville fortifiée.
\renewcommand{\LettrineFontHook}{\Rothdnfamily}
\vspace{.5\baselineskip}
-\textit{Le calcul de la taille de la lettrine prend comme référence les
- lettres EFTZ (voir {\ttfamily\upshape\boi LettrineTestString}),
- dans le cas de la police Rothdn ça donne ceci pour A :
-}
+
+\textit{Le calcul de la taille de la lettrine prend normalement comme
+ référence les lettres EFTZ (voir {\upshape\cs{LettrineTestString}}),
+ dans le cas de la police Rothdn ça donne ceci pour A : }
\verb+\lettrine[lines=3]{A}{u} bord du marais+
\lettrine[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.
+terrestre de la ville fortifiée, celle qui menait à Psalmody,
+l'une des « abbayes de sel» dont il ne reste que quelques vestiges.
-\vspace{.5\baselineskip}
+\vspace{\baselineskip}
\textit{L’option {\ttfamily\upshape refstring} donne une taille correcte à la
lettrine (le calcul est fait sur la base du A lui-même et non de EFTZ%
\footnote{Le F de la police Rothdn a une hauteur supérieure à celles des
@@ -211,11 +210,12 @@ terrestre de la ville fortifiée, celle qui menait à Psalmody.
\lettrine[refstring, 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.
+terrestre de la ville fortifiée, celle qui menait à Psalmody,
+l'une des « abbayes de sel» dont il ne reste que quelques vestiges.
-\vspace{.5\baselineskip}
-\textit{Il suffit maintenant de remonter un peu la lettrine
+\vspace{\baselineskip}
+\textit{Il suffit maintenant de remonter la lettrine
({\ttfamily\upshape lraise=0.15}) pour compenser sa profondeur :
}
@@ -225,10 +225,10 @@ terrestre de la ville fortifiée, celle qui menait à Psalmody.
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.
+terrestre de la ville fortifiée, celle qui menait à Psalmody,
+l'une des « abbayes de sel» dont il ne reste que quelques vestiges.
\newpage
-\restoregeometry
\begin{center}
\large\bfseries Utilisation d'une image comme lettrine
\end{center}
@@ -240,12 +240,12 @@ d'utiliser le booléen \texttt{image}, exemple :
\begin{otherlanguage}{german}
\renewcommand{\LettrineTextFont}{\relax}
-\fontfamily{yfrak}\selectfont\Large
+\fontfamily{yfrak}\fontencoding{T1}\selectfont\Large
\lettrine[image=true,lhang=.2, loversize=.25, findent=0.1em]
{W}{er} reitet so spät durch Nacht und Wind?\\
Es ist der Vater mit seinem Kind;\\
Er hat den Knaben wohl in dem Arm,\\
-Er faßt ihn sicher, er hält ihn warm.\par
+Er fa{\ss}t ihn sicher, er hält ihn warm.\par
\end{otherlanguage}
\vspace{.5\baselineskip}
@@ -257,17 +257,17 @@ de \verb+graphicx.sty+).
\begin{verbatim}
\begin{otherlanguage}{german}
- \fontfamily{yfrak}\selectfont\Large
+ \fontfamily{yfrak}\fontencoding{T1}\selectfont\Large
\renewcommand{\LettrineTextFont}{\relax}
\lettrine[image=true,lhang=.2, loversize=.25, findent=0.1em]
{W}{er} reitet so spät durch Nacht und Wind?\\
Es ist der Vater mit seinem Kind;\\
Er hat den Knaben wohl in dem Arm,\\
- Er faßt ihn sicher, er hält ihn warm.\par
+ Er fa{\ss}t ihn sicher, er hält ihn warm.\par
\end{otherlanguage}
\end{verbatim}
-Cet exemple fait appel aux fichiers suivants :
+Pour la compilation en pdfLaTeX cet exemple fait appel aux fichiers suivants :
\begin{itemize}
\item \texttt{graphicx.sty} (extension standard \LaTeXe{}),
\item \texttt{blackletter1} de Thorsten~\textsc{Bronger} (disponible sur CTAN),
@@ -283,18 +283,13 @@ indications de Denis~\textsc{Roegel} que je remercie bien vivement.
Une solution plus simple s’offre aux utilisateurs de LuaLaTeX ou XeLaTeX pour
reproduire le poème ci-dessus : il suffit d’utiliser la police OpenType Yinit
pour la lettrine et par exemple une des polices OpenType UnifrakturMaguntia
-pour le texte, voir \url{http://unifraktur.sourceforge.net/maguntia.html}.
-
-Le codage est identique à ceci près que l’option \texttt{image=true} est
-supprimée et l’appel à la police \texttt{yfrak} remplacé par :\\
-\verb+\setmainfont{UnifrakturMaguntia19}\Large+\\
-\verb+\renewcommand{\LettrineFontHook}{\setmainfont{Yinit}}+
+pour le texte, voir le fichier \file{demo-lua.pdf}.
\vfill
\begin{flushright}
Daniel \textsc{Flipo}\\
\texttt{daniel.flipo@free.fr}\\
- avril 2019.
+ mars 2020.
\end{flushright}
\end{document}
@@ -303,4 +298,5 @@ supprimée et l’appel à la police \texttt{yfrak} remplacé par :\\
%%% mode: latex
%%% coding: utf-8
%%% TeX-master: t
+%%% TeX-engine: xetex
%%% End:
diff --git a/Master/texmf-dist/doc/latex/lettrine/demo-lua.pdf b/Master/texmf-dist/doc/latex/lettrine/demo-lua.pdf
new file mode 100644
index 00000000000..f0e6257e6ea
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/lettrine/demo-lua.pdf
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/lettrine/demo-lua.tex b/Master/texmf-dist/doc/latex/lettrine/demo-lua.tex
new file mode 100644
index 00000000000..4492ade68e1
--- /dev/null
+++ b/Master/texmf-dist/doc/latex/lettrine/demo-lua.tex
@@ -0,0 +1,116 @@
+\documentclass[12pt,paper=a4,german,french,british]{scrartcl}
+
+\usepackage{lettrine}
+\usepackage[dvipsnames]{xcolor}
+\usepackage[colorlinks, urlcolor=ForestGreen, linkcolor=blue]{hyperref}
+
+%%% Linux Libertine fonts...
+\usepackage{fontspec}
+\setmainfont{Linux Libertine O}
+%\setsansfont{TeX Gyre Heros}[Scale=MatchLowercase]
+\setmonofont{Latin Modern Mono}[Scale=MatchLowercase]
+
+\usepackage{Typocaps}
+
+\usepackage{babel}
+\frenchbsetup{AutoSpacePunctuation=false, og=«,fg=»}
+\babeltags{fr=french, de=german, uk=british}
+
+\newcommand*{\file}[1]{\texttt{#1}}
+\newcommand*{\cs}[1]{\texttt{\boi#1}}
+\newcommand*{\MF}{{\small\scshape metafont}}
+
+\setlength{\parindent}{0pt}
+\sloppy
+
+\begin{document}
+\thispagestyle{empty}
+\enlargethispage{2\baselineskip}
+
+\begin{center}
+\large\bfseries Some LuaLaTeX examples
+\end{center}
+
+Both files \file{demo-fr.tex} and \file{demo-de.tex} can be compiled either with
+pdfLaTeX or with LuaLaTeX or XeLaTeX. The purpose of the next examples is to
+show how easy it is to change the font for the dropped initial with Unicode
+engines: no need to care about the low-level NFSS syntax, a simple
+\cs{fontspec} call will do the trick.
+
+\vspace{.5\baselineskip}
+In the first example, \textit{ Linux Libertine Initials} is used for the
+dropped capital:\\
+\verb+\renewcommand{\LettrineFontHook}{\fontspec{LinLibertine_I.otf}}+\\
+\verb+\lettrine[lines=3]{E}{n plein marais de la Souteyranne...}+
+
+\begin{fr}
+ \renewcommand{\LettrineFontHook}{\fontspec{LinLibertine_I.otf}}
+ \lettrine[lines=3]{E}{n plein 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,
+ l'une des « abbayes de sel» dont il ne reste que quelques vestiges.\par
+\end{fr}
+
+\vspace{.5\baselineskip}
+Of course, it is still possible to use Type\,1 fonts for the dropped capitals,
+here \textit{Typocaps} (red):\\
+\verb+\renewcommand{\LettrineFontHook}{\Typocapsfamily\color{red}}+\\
+\verb+\lettrine[findent=.3em]{E}{n plein marais de la Souteyranne}...+
+
+\begin{fr}
+\renewcommand{\LettrineFontHook}{\Typocapsfamily\color{red}}
+\lettrine[findent=.3em]{E}{n plein 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.\par
+\end{fr}
+
+\vspace{.5\baselineskip}
+OpenType and TrueType free fonts are available for Old German, here is an example
+featuring the \textit{Yinit} OpenType font%
+\footnote{produced by Élie Roux from Yannis Haralambous’ Gothic Initials
+ originally in \MF.}
+for the initial and \textit{UnifrakturMaguntia} TrueType font%
+\footnote{\url{http://unifraktur.sourceforge.net/maguntia.html}}
+for the running text. The later has several nice \textit{optional features},
+(here long s and old umlaut variant):
+
+\verb+\setmainfont{UnifrakturMaguntia.ttf}[StylisticSet=11,CharacterVariant=15]+\\
+\verb+\renewcommand{\LettrineTextFont}{\relax} % No small caps here!+ \\
+\verb+\renewcommand{\LettrineFontHook}{\fontspec{Yinit.otf}}+\\
+\verb+\lettrine[lhang=.2, loversize=.25, findent=0.1em]{W}{er} reitet+
+
+\begin{de}\Large
+\setmainfont{UnifrakturMaguntia.ttf}[StylisticSet=11,CharacterVariant=15]
+\renewcommand{\LettrineTextFont}{\relax}
+\renewcommand{\LettrineFontHook}{\fontspec{Yinit.otf}}
+\lettrine[lhang=.2, loversize=.25, findent=0.1em]
+{W}{er} reitet so spät durch Nacht und Wind?\\
+Es ist der Vater mit seinem Kind;\\
+Er hat den Knaben wohl in dem Arm,\\
+Er faßt ihn sicher, er hält ihn warm.\par
+\end{de}
+
+\vspace{.5\baselineskip}
+Without the \textit{optional features}, the output looks more modern:
+
+\begin{otherlanguage}{german}\Large
+\setmainfont{UnifrakturMaguntia.ttf}
+\renewcommand{\LettrineTextFont}{\relax}
+\renewcommand{\LettrineFontHook}{\fontspec{Yinit.otf}}
+\lettrine[lhang=.2, loversize=.25, findent=0.1em]
+{W}{er} reitet so spät durch Nacht und Wind?\\
+Es ist der Vater mit seinem Kind;\\
+Er hat den Knaben wohl in dem Arm,\\
+Er faßt ihn sicher, er hält ihn warm.\par
+\end{otherlanguage}
+
+\end{document}
+
+%%% Local Variables:
+%%% mode: latex
+%%% coding: utf-8
+%%% TeX-master: t
+%%% TeX-engine: luatex
+%%% End:
diff --git a/Master/texmf-dist/doc/latex/lettrine/demo.pdf b/Master/texmf-dist/doc/latex/lettrine/demo.pdf
deleted file mode 100644
index c0253dc0d5b..00000000000
--- a/Master/texmf-dist/doc/latex/lettrine/demo.pdf
+++ /dev/null
Binary files differ
diff --git a/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf b/Master/texmf-dist/doc/latex/lettrine/lettrine.pdf
index 9d206d0d65c..5660e16e1b2 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/contrib.dtx b/Master/texmf-dist/source/latex/lettrine/contrib.dtx
index 15fa6217409..63d23d094bb 100644
--- a/Master/texmf-dist/source/latex/lettrine/contrib.dtx
+++ b/Master/texmf-dist/source/latex/lettrine/contrib.dtx
@@ -33,8 +33,8 @@
%%
%% A
\LettrineOptionsFor{A}{slope=0.1\LettrineWidth, findent=-.5em, nindent=.7em}
-%% Same parameters for \`A
-\LettrineOptionsFor{\`A}{slope=0.1\LettrineWidth, findent=-.5em, nindent=0.7em}
+%% Same parameters for À (utf-8)
+\LettrineOptionsFor{À}{slope=0.1\LettrineWidth, findent=-.5em, nindent=0.7em}
%% C'
\LettrineOptionsFor{C'}{nindent=-0.5em}
%% I and J hang into the margin
diff --git a/Master/texmf-dist/source/latex/lettrine/contrib.ins b/Master/texmf-dist/source/latex/lettrine/contrib.ins
index 2070b331cf6..3762e5aef2e 100644
--- a/Master/texmf-dist/source/latex/lettrine/contrib.ins
+++ b/Master/texmf-dist/source/latex/lettrine/contrib.ins
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 1999-2018 Daniel Flipo.
+%% Copyright (C) 1999-2020 Daniel Flipo.
%%
%% This program can be distributed and/or modified under the terms
%% of the LaTeX Project Public License either version 1.3c of this
diff --git a/Master/texmf-dist/source/latex/lettrine/lettrine.dtx b/Master/texmf-dist/source/latex/lettrine/lettrine.dtx
index a522c917b2e..c357e97aba5 100644
--- a/Master/texmf-dist/source/latex/lettrine/lettrine.dtx
+++ b/Master/texmf-dist/source/latex/lettrine/lettrine.dtx
@@ -2,7 +2,7 @@
%
% \iffalse meta-comment
%
-% Copyright © 1999-2018 Daniel Flipo.
+% Copyright © 1999-2020 Daniel Flipo.
%
% This program can be distributed and/or modified under the terms
% of the LaTeX Project Public License either version 1.3c of this
@@ -26,20 +26,25 @@
\ProvidesFile{lettrine.dtx}
%</dtx>
%<*!cfg>
- [2019-04-06 v2.22 (Daniel Flipo)]
+ [2020-03-14 v2.23 (Daniel Flipo)]
%</!cfg>
%
% Lettrine package for LaTeX version 2e
%
-% Copyright © 1999-2019 by Daniel Flipo
+% Copyright © 1999-2020 by Daniel Flipo
%
% Please report errors to: daniel (dot) flipo (at) free (dot) fr
%
%<*driver>
\documentclass[a4paper]{ltxdoc}
+\usepackage[dvipsnames]{xcolor}
\usepackage{unicode-math}
-\setmainfont{Latin Modern Roman}
-\setmathfont{XITS Math}
+\setmainfont{erewhon}
+\setsansfont{Cabin}[Scale=MatchLowercase]
+\setmonofont{Inconsolatazi4}[Scale=MatchLowercase, Color=Sepia,
+ HyphenChar=None,StylisticSet={2,3}]
+\setmathfont{Erewhon-Math.otf}
+\usepackage{fourier-orns}
\usepackage[expansion=true,protrusion=true]{microtype}
\usepackage{url}
\usepackage[numbered]{hypdoc}
@@ -47,6 +52,7 @@
\usepackage{lettrine}
\usepackage{tikz}
\usetikzlibrary{shapes.arrows}
+\renewcommand{\labelitemi}{\starredbullet}
%
\RecordChanges
\AtEndDocument{%
@@ -59,15 +65,15 @@
%
\newcommand*\file[1]{\texttt{#1}}
\newcommand*\lopt[1]{\texttt{#1}}
-\renewcommand\meta[1]{\textit{<#1>}} % no math mode (see doc.sty)
+\renewcommand\meta[1]{\textit{\color{Sepia}<#1>}} % no math mode (see doc.sty)
%
\setlength{\parindent}{0pt}
\setlength{\parskip}{.3\baselineskip}
\begin{document}
\GetFileInfo{lettrine.dtx}
\begin{center}
- \textbf{\Large Typesetting dropped capitals in \LaTeXe{} documents}
- \\[.2\baselineskip]^^A\]
+ \textbf{\Large Typesetting dropped capitals with LaTeX}
+ \\[.5\baselineskip]^^A\]
{\large Daniel Flipo}\\
\texttt{daniel.flipo@free.fr}
\end{center}
@@ -84,7 +90,9 @@
% \filedate.}, provides a command |\lettrine| which requires two
% mandatory arguments, and an optional one.
%
-% Adding |\usepackage{lettrine}| in the preamble of a document
+% \changes{v2.23}{2020/03/14}{Documentation cleanup.}
+%
+% Adding |\usepackage{lettrine}| in the preamble of a document
% defines the command |\lettrine|, the simplest use of which is
% |\lettrine{|\meta{letter}|}{|\meta{text}|}|.
% It produces a dropped capital \meta{letter} (2 lines high),
@@ -110,122 +118,106 @@
% \changes{v1.7}{2014/09/16}{New counter to add lines for
% dropped capitals with positive depth, like Q.}
%
-% \item \lopt{depth=}\meta{integer} sets the number of lines to
-% be reserved under the baseline, this is meant for dropped
-% capital with positive depth, like Q (default=0);
-% \item \lopt{lhang=}\meta{decimal} ($0\le|lhang|\le1$) sets
-% how much of the dropped capital’s width should hang into
-% the margin (default=0);
-% \item \lopt{loversize=}\meta{decimal} ($-1<\lopt{loversize}\le1$)
-% enlarges the dropped capital’s height: with
-% \lopt{loversize=0.1} its height is enlarged by 10\% so
-% that it raises above the top paragraph’s line (default=0);
-% \item \lopt{lraise=}\meta{decimal} does not affect the dropped
-% capital’s height, but moves it up (if positive),
-% down (if negative); useful with capitals like |J| or |Q|
-% which have a positive depth, (default=0);
-% \item \lopt{findent=}\meta{dimen} (positive or negative)
-% controls the horizontal gap between the dropped capital
-% and the indented block of text (default=0pt);
-% \item \lopt{nindent=}\meta{dimen} shifts all indented lines,
-% starting from the second one, horizontally by
-% \meta{dimen} (this shift is relative to the first
-% line, default=0.5em);
-% \item \lopt{slope=}\meta{dimen} can be used with dropped
-% capitals like |A| or |V| to add \meta{dimen}
-% (positive or negative) to the indentation of each line
-% starting from the third one (no effect if \lopt{lines=2},
-% default=0pt);
-% \item \lopt{ante=}\meta{text} can be used to typeset \meta{text}
-% \emph{before} the dropped capital (typical use is for
-% French guillemets starting the paragraph).
+% \item \lopt{depth=}\meta{integer} sets the number of lines to be
+% reserved under the baseline, this is meant for dropped capital with
+% positive depth, like Q (default=0);
+% \item \lopt{lhang=}\meta{decimal} ($0\le|lhang|\le1$) sets how much
+% of the dropped capital’s width should hang into the margin
+% (default=0);
+% \item \lopt{loversize=}\meta{decimal} ($-1<\lopt{loversize}\le1$)
+% enlarges the dropped capital’s height: with \lopt{loversize=0.1}
+% its height is enlarged by 10\% so that it raises above the top
+% paragraph’s line (default=0);
+% \item \lopt{lraise=}\meta{decimal} does not affect the dropped
+% capital’s height, but moves it up (if positive), down (if
+% negative); useful with capitals like |J| or |Q| which have
+% a positive depth, (default=0);
+% \item \lopt{findent=}\meta{dimen} (positive or negative) controls the
+% horizontal gap between the dropped capital and the indented block
+% of text (default=0pt);
+% \item \lopt{nindent=}\meta{dimen} shifts all indented lines, starting
+% from the second one, horizontally by \meta{dimen} (this shift is
+% relative to the first line, default=0.5em);
+% \item \lopt{slope=}\meta{dimen} can be used with dropped capitals
+% like |A| or |V| to add \meta{dimen} (positive or negative) to the
+% indentation of each line starting from the third one (no effect if
+% \lopt{lines=2}, default=0pt);
+% \item \lopt{ante=}\meta{text} can be used to typeset \meta{text}
+% \emph{before} the dropped capital (typical use is for French
+% guillemets starting the paragraph).
%
% \changes{v1.6}{2004/05/22}{Add a flag to switch to
% images in eps or pdf format. Suggested by Bill Jetzer.}
%
-% \item \lopt{image=true} (new to version 1.6) will force
-% |\lettrine| to replace the letter normally used as
-% dropped capital by an image in eps format (latex) or
-% in pdf, jpg, etc.\ format (pdflatex); this needs the
-% |graphicx| package to be loaded in the preamble of course.
-% |\lettrine[image=true]{A}{n exemple}| or just
-% |\lettrine[image]{A}{n exemple}| will load |A.eps|,
-% |A.jpg|, |A.png| or |A.pdf| instead of letter~A.
-% This was suggested by Bill Jetzer.\\
-% N.B.: Redefining |\LettrineFont| as |\LettrineFontEPS|
-% is no longer supported and |\LettrineFontEPS| has been
-% renamed as |\LettrineImage|.
+% \item \lopt{image=true} will force |\lettrine| to replace the letter
+% normally used as dropped capital by an image in eps format (latex)
+% or in pdf, jpg, etc.\ format (pdflatex, xelatex, lualatex);
+% this requires the |graphicx| package to be loaded in the preamble.
+% |\lettrine[image=true]{A}{n exemple}|\quad or just\\
+% |\lettrine[image]{A}{n exemple}|\\
+% will load |A.eps|, |A.jpg|, |A.png| or |A.pdf| instead of letter~A.\\
+% N.B.: Redefining |\LettrineFont| as |\LettrineFontEPS| is no longer
+% supported and |\LettrineFontEPS| has been renamed as
+% |\LettrineImage|.
%
% \changes{v1.8}{2015/02/06}{Added two keyval options:
% `grid’ (true/false) and `novskip’ to override \cs{DiscardVskip}.}
%
-% \item \lopt{grid=true} (new to version 1.8) will force
-% the vertical skip added above the paragraph starting with
-% |\lettrine| to be rounded up to an integer number of
-% |\baselineskip|.
-% This option is meant for grid typesetting.
-% \item \lopt{novskip=}\meta{dimen} (new to version 1.8)
-% overrides |\DiscardVskip| (default=0.2pt). In some cases
-% (see options \lopt{lraise}, \lopt{loversize} or
-% accentuated dropped capitals,\dots) the top of the
-% dropped capital will raise above the top of following
-% text (usually in small caps), this will trigger
-% a corresponding vertical skip above the paragraph
-% starting with |\lettrine|, \emph{only if} this skip
-% exceeds |\DiscardVskip|.
-% Consider enlarging |novskip| (or |\DiscardVskip|) to
-% prevent small vertical skips from being rounded up to
-% |\baselineskip| when using the `grid’ option.
+% \item \lopt{grid=true} will force the vertical skip added above the
+% paragraph starting with |\lettrine| to be rounded up to an integer
+% number of |\baselineskip|. This option is meant for grid
+% typesetting.
+% \item \lopt{novskip=}\meta{dimen} overrides |\DiscardVskip|
+% (default=0.2pt). In some cases (see options \lopt{lraise},
+% \lopt{loversize} or accentuated dropped capitals,\dots) the top of
+% the dropped capital will raise above the top of following text
+% (usually in small caps), this will trigger a corresponding vertical
+% skip above the paragraph starting with |\lettrine|, \emph{only if}
+% this skip exceeds |\DiscardVskip|. Consider enlarging |novskip|
+% (or |\DiscardVskip|) to prevent small vertical skips from being
+% rounded up to |\baselineskip| when using the `grid’ option.
%
% \changes{v1.9}{2015/08/31}{New keyval option: `realheight’
% (true/false) and new global flag \cs{ifLettrineRealHeight}.}
%
-% \item \lopt{realheight=true} (new to version 1.9) will
-% compute the default height of the initial so that the
-% top of it is exactly aligned with the top of the text
-% entered as second mandatory argument of |\lettrine|
-% taking possible accents into account.
-% Otherwise, the default height is computed using a
-% customisable string |\LettrineSecondString| instead of
-% the real argument. For backward compatibility, option
-% \lopt{realheight} defaults to \lopt{false} and
-% |\LettrineSecondString| to `x’.
-%
-% You probably don’t need this option if you choose to
-% typeset the second mandatory argument of |\lettrine| in
-% small caps (the default). If you change
-% |\LettrineTextFont| to |\relax| or |\upshape|, consider
-% these two examples:
-% \begin{description}
-% \item |\lettrine{H}{ello}| you probably would like the
-% top of the `H’ to be aligned with the top of the `ll’
-% rather than with the top of the `e’, adding option
-% |realheight| does the trick:
-% |\lettrine[realheight]{H}{ello}|.\par
-% Global variants : |\LettrineRealHeighttrue| or (without
-% |realheight| option)
-% |\renewcommand*{\LettrineSecondString}{l}|.
-% \item |\lettrine{L}{a misère}| option
-% \lopt{realheight=true} would align with the top
-% of the `L’ with the top of the grave accent, the
-% default is probably better (top of the `L’ aligned with
-% the top of the non accented letters).
-% \end{description}
-%
-% \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
-% \cs{LettrineTestString} locally.}
-% (new to version 2.1) is meant for fancy initials with
-% irregular heights (i.e.\ taken in fonts like Yinit
-% (OpenType), \file{cfr-initials},\dots).
-% \lopt{refstring} forces the |\fontsize| computations to
-% be run on the initial given as |\lettrine|’s first
-% mandatory argument instead of the reference string
-% |\LettrineTestString|. In most cases, this option should
-% \emph{not} be used: think of accentuated initials or
-% capitals with optical correction.
+% \item \lopt{realheight=true} will compute the default height of the
+% initial so that the top of it is exactly aligned with the top of
+% the text entered as second mandatory argument of |\lettrine|
+% taking possible accents into account. Otherwise, the default
+% height is computed using a customisable string
+% |\LettrineSecondString| instead of the real argument. For
+% backward compatibility, option \lopt{realheight} defaults to
+% \lopt{false} and |\LettrineSecondString| to `x’.
+%
+% You probably don’t need this option if you choose to typeset
+% the second mandatory argument of |\lettrine| in small caps
+% (the default). If you change |\LettrineTextFont| to |\relax|
+% or |\upshape|, consider these two examples:
+% \begin{description}
+% \item |\lettrine{H}{ello}| you might like the top of the
+% `H’ to be aligned with the top of the `ll’ rather than with the
+% top of the `e’, adding option |realheight| does the trick:
+% |\lettrine[realheight]{H}{ello}|.\par
+% Global variants : |\LettrineRealHeighttrue| or (without the
+% |realheight| option) |\renewcommand*{\LettrineSecondString}{l}|.
+% \item |\lettrine{L}{a misère}| option \lopt{realheight=true} would
+% align with the top of the `L’ with the top of the grave accent,
+% the default is probably better (top of the `L’ aligned with the
+% top of the non accented letters).
+% \end{description}
+%
+% \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 \cs{LettrineTestString}
+% locally.} is meant for fancy initials with
+% irregular heights (i.e.\ taken in fonts like Yinit (OpenType),
+% \file{cfr-initials},\dots). \lopt{refstring} forces the
+% |\fontsize| computations to be run on the initial given as
+% |\lettrine|’s first mandatory argument instead of the reference
+% string |\LettrineTestString|. In most cases, this option should
+% \emph{not} be used: think of accentuated initials or capitals with
+% optical correction.
%
% \end{itemize}
%
@@ -235,8 +227,9 @@
% |{V}{oici} un exemple |\dots
%
% Coloured initials are possible in conjonction with package
-% \file{color}, examples: |\lettrine{\textcolor{red}{A}}{n} example|
-% \quad or\\ |\lettrine{\textcolor[gray]{0.5}{A}}{nother} one| \\
+% \file{color}, examples: \\
+% |\lettrine{\textcolor{red}{A}}{n} example|\quad or\\
+% |\lettrine{\textcolor[gray]{0.5}{A}}{nother} one| \\
% see package \file{color} for the syntax of colour commands.
% Another possibility to colour initials globally is described
% below, see |\LettrineFontHook|.
@@ -244,9 +237,10 @@
% Three dimensions, |\LettrineWidth|, |\LettrineHeight| and
% |\LettrineDepth|, store the final size of the initial.
%
-% 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.
+% Once \file{lettrine.sty} will be installed (run \texttt{lualatex}
+% on \file{lettrine.ins} to extract it), compile \file{demo-fr.tex}
+% and \file{demo-lua.tex} print the resulting PDFs to see the
+% possible usage of these parameters.
%
% \changes{v1.9}{2015/08/31}{New customisable string
% \cs{LettrineSecondString} to tune the initial’s height.}
@@ -289,24 +283,31 @@
% |\LettrineTextFont| sets the font used for the second argument
% of |\lettrine|, its default definition is
% |\newcommand{\LettrineTextFont}{\scshape}| (second argument in
-% small caps, this can be changed using |\renewcommand|).
-%
-% |\LettrineFont| sets the font used for the dropped capital,
-% usually the current font in a (large) size, computed
-% automatically from the number of lines it will fill:
-% the font size is computed so that, a \emph{standard} dropped
-% capital (say Z, not À) when sitting on its baseline, gets
-% its top aligned with the top of the following text (provided
-% $|loversize|=0$ and $|lines|\ge 2$). When \lopt{lines=1},
-% size is computed as if \lopt{lines} was~2.\\
+% small caps), this can be changed using |\renewcommand|.
+%
+% |\LettrineFont| \emph{is not customisable} see |\LettrineFontHook|
+% below, it sets the font used for the dropped capital, usually the
+% current font in a (large) size, computed automatically from the
+% number of lines it will fill: the font size is computed so that,
+% a \emph{standard} dropped capital (say Z, not À) when sitting on
+% its baseline, gets its top aligned with the top of the following
+% text (provided $|loversize|=0$ and $|lines|\ge 2$). When
+% \lopt{lines=1}, size is computed as if \lopt{lines} was~2.
+%
% A hook |\LettrineFontHook| is provided to change the font
-% used for the dropped capital, syntax follows \LaTeX{}’s
-% low-level font interface (see \LaTeX{} Companion, p.187--192),
+% used for the dropped capital, syntax follows LaTeX’s
+% low-level font interface (see LaTeX Companion, p.187--192),
% the |\selectfont| command is issued by |\LettrineFont|:\\
% |\renewcommand{\LettrineFontHook}{\fontfamily{ppl}|\ignorespaces
% |\fontseries{bx}}%|\\
% | \fontshape{sl}}|,\\
-% selects Palatino bold expanded slanted for the dropped capital.\\
+% selects Palatino bold expanded slanted for the dropped capital.
+%
+% With LuaLaTeX or XeLaTeX changing the lettrine’s font is
+% even easier, simply use the |\fontspec| command:\\
+% |\renewcommand{\LettrineFontHook}{\fontspec{LinLibertine_I.otf}|\\
+% will switch to Linux Libertine Initials.
+%
% |\LettrineFontHook| can also be used to change the colour of
% all initials in a (part of) document:
% |\renewcommand{\LettrineFontHook}{\color[gray]{0.5}}| \\
@@ -348,7 +349,7 @@
% (Palatino, Times, Utopia\dots), or any OpenType font, they are
% fully scalable too!
%
-% \vspace{\baselineskip}
+% \newpage{}
% \textbf{Known issues:}
% \begin{itemize}
% \item Nothing is done to prevent page-breaking in a paragraph
@@ -363,7 +364,7 @@
% |\parshape=0| just after the end of the list (starting a new
% paragraph just before or just after the list works too).
% Remember that `quote’, `quotation’, `abstract’ environments
-% are implemented as \emph{lists} in \LaTeX{}.
+% are implemented as \emph{lists} in LaTeX.
% \item If you are facing some slight height inaccuracy for a
% dropped capital, you can try option \lopt{refstring};
% this option is meant for fancy (unaccented) initials.
@@ -380,9 +381,9 @@
% 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).
+% \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}
@@ -407,7 +408,7 @@
\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{}{2019-03-30}
+ \DeclareCurrentRelease{}{2020-03-14}
\else
\PackageWarning{lettrine}{Your LaTeX kernel is too old to provide
access\MessageBreak to former versions of the lettrine package.%
@@ -417,7 +418,7 @@
\fi
% \end{macrocode}
%
-% This package only runs with \LaTeXe{} and requires files
+% This package only runs with LaTeX and requires files
% \file{keyval.sty} and \file{minifp.sty}.
%
% \begin{macrocode}
@@ -698,7 +699,7 @@
%
% \begin{macro}{\LettrineImage}
% The following definition is for use with dropped capitals defined
-% as images: EPS, PDF, JPG, PNG files (see examples in demo.tex).
+% as images: EPS, PDF, JPG, PNG files (see examples in demo-fr.tex).
% Its use requires the |graphicx| package to be loaded in the
% preamble with |\usepackage{graphicx}|. The required size is
% computed just as in the standard case, |\includegraphics|
@@ -914,7 +915,7 @@
\@tempdima=\L@oversize pt\relax
\PackageInfo{lettrine.sty}%
{Targeted height = \the\L@target@tht\MessageBreak
- (no accent, loversize=0),\MessageBreak
+ (for loversize=0, accent excluded),\MessageBreak
Lettrine height = \the\LettrineHeight\space (#2)%
\ifdim\@tempdima=\z@\else\space loversize=\L@oversize\fi;%
\MessageBreak reported}%
@@ -1079,7 +1080,7 @@
}
% \end{macrocode}
%
-% Load a local config file if present in \LaTeX{}’s search path.
+% Load a local config file if present in LaTeX’s search path.
% \begin{macrocode}
\InputIfFileExists{lettrine.cfg}
{\typeout{Loading lettrine.cfg}}
@@ -1166,4 +1167,5 @@
%%% Local Variables:
%%% fill-column: 72
%%% coding: utf-8
+%%% TeX-engine: luatex
%%% End:
diff --git a/Master/texmf-dist/source/latex/lettrine/lettrine.ins b/Master/texmf-dist/source/latex/lettrine/lettrine.ins
index a2fd3ac5bf9..8c605c8aad9 100644
--- a/Master/texmf-dist/source/latex/lettrine/lettrine.ins
+++ b/Master/texmf-dist/source/latex/lettrine/lettrine.ins
@@ -1,5 +1,5 @@
%%
-%% Copyright (C) 1999-2019 Daniel Flipo.
+%% Copyright (C) 1999-2020 Daniel Flipo.
%%
%% This file will generate fast loadable files and documentation
%% driver files from the doc files in this package when run through
diff --git a/Master/texmf-dist/tex/latex/lettrine/lettrine.sty b/Master/texmf-dist/tex/latex/lettrine/lettrine.sty
index 8913693ec97..92486bbac83 100644
--- a/Master/texmf-dist/tex/latex/lettrine/lettrine.sty
+++ b/Master/texmf-dist/tex/latex/lettrine/lettrine.sty
@@ -27,12 +27,12 @@
%%
\NeedsTeXFormat{LaTeX2e}[2018-04-01]
\ProvidesFile{lettrine.sty}
- [2019-04-06 v2.22 (Daniel Flipo)]
+ [2020-03-14 v2.23 (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{}{2019-03-30}
+ \DeclareCurrentRelease{}{2020-03-14}
\else
\PackageWarning{lettrine}{Your LaTeX kernel is too old to provide
access\MessageBreak to former versions of the lettrine package.%
@@ -225,7 +225,7 @@
\@tempdima=\L@oversize pt\relax
\PackageInfo{lettrine.sty}%
{Targeted height = \the\L@target@tht\MessageBreak
- (no accent, loversize=0),\MessageBreak
+ (for loversize=0, accent excluded),\MessageBreak
Lettrine height = \the\LettrineHeight\space (#2)%
\ifdim\@tempdima=\z@\else\space loversize=\L@oversize\fi;%
\MessageBreak reported}%
diff --git a/Master/texmf-dist/tex/latex/lettrine/optfile.cfl b/Master/texmf-dist/tex/latex/lettrine/optfile.cfl
index 3803ea3f110..78f0e4ab00e 100644
--- a/Master/texmf-dist/tex/latex/lettrine/optfile.cfl
+++ b/Master/texmf-dist/tex/latex/lettrine/optfile.cfl
@@ -15,8 +15,8 @@
%%
%% A
\LettrineOptionsFor{A}{slope=0.1\LettrineWidth, findent=-.5em, nindent=.7em}
-%% Same parameters for \`A
-\LettrineOptionsFor{\`A}{slope=0.1\LettrineWidth, findent=-.5em, nindent=0.7em}
+%% Same parameters for À (utf-8)
+\LettrineOptionsFor{À}{slope=0.1\LettrineWidth, findent=-.5em, nindent=0.7em}
%% C'
\LettrineOptionsFor{C'}{nindent=-0.5em}
%% I and J hang into the margin