diff options
28 files changed, 56 insertions, 42 deletions
diff --git a/Master/texmf-dist/doc/fonts/kpfonts-otf/Kpfonts-OTF-Doc-English.ltx b/Master/texmf-dist/doc/fonts/kpfonts-otf/Kpfonts-OTF-Doc-English.ltx index 896999c02ab..08e3d13136c 100644 --- a/Master/texmf-dist/doc/fonts/kpfonts-otf/Kpfonts-OTF-Doc-English.ltx +++ b/Master/texmf-dist/doc/fonts/kpfonts-otf/Kpfonts-OTF-Doc-English.ltx @@ -6,15 +6,10 @@ \usepackage[svgnames]{xcolor} \usepackage[hypcap=false]{caption} \usepackage{shortvrb} -\usepackage[veryoldstyle]{kpfonts-otf} -\defaultfontfeatures+[\ttfamily]{RawFeature={-hist;-calt;-swsh;-onum}} -\defaultfontfeatures+[KpRoman,KpLight,\sffamily]{% - RawFeature={-hist;-hlig;-calt;-swsh;-rlig;-onum},% -} -\setmainfont{KpRoman} -\setsansfont{KpSans} -\setmonofont{KpMono}[Color=DarkBlue] -%Math demos +% Option "longs" for local exemples of the long s +\usepackage[longs]{kpfonts-otf} + +% Math demos \setmathfont{KpMath-Regular.otf}[version=full, CharacterVariant=3, StylisticSet={1,2,3,4,5,6,7}] \setmathfont{KpMath-Regular.otf}[version=base, CharacterVariant=3] @@ -47,8 +42,8 @@ \title{Kp-fonts: OpenType version} \author{\href{mailto:daniel.flipo@free.fr}{Daniel \textsc{Flipo}}} -\newcommand*{\version}{0.38} -\date{12th September, 2021} +\newcommand*{\version}{0.39} +\date{28th September, 2021} \begin{document} \selectlanguage{british} @@ -213,7 +208,7 @@ and a bunch of Kp-fonts specifics symbols. \item \textsc{\textbf{\test}} \end{itemize} -\item[veryoldstyle:] \hlabel{veryoldstyle} same as option \opt{oldstyle} but +\item[veryoldstyle:] same as option \opt{oldstyle} but the round `s’ is replaced by the long one {\addfontfeatures{RawFeature=+hist;+hlig}`s\hspace{1sp}’}, unless it ends a word (then it remains `s’)% @@ -228,7 +223,17 @@ and a bunch of Kp-fonts specifics symbols. {\addfontfeatures{RawFeature=+hist;+hlig;+calt}% \textit{some of Highlands’ mysterious castles…}} which is correct; with XeTeX an \texttt{=} sign must be added at the end of - \texttt{mysterious=} to get a round `s’ there. + \texttt{mysterious=} to get a round `s’ there : + final `s’ followed by a punctuation sign is never turned into + {\addfontfeatures{RawFeature=+hist;+hlig}`s\hspace{1sp}’}, when followed by + a space it is a trickier, see option \opt{longs} below. + +\item[longs] \hlabel{longs} + inhibits the transformation of an `s’ followed by a space into + {\addfontfeatures{RawFeature=+hist;+hlig}`s\hspace{1sp}’}. This option, + available only with LuaTeX, is silently switched on by \opt{veryoldstyle}; + it is used explicitly in the present document to deal with the examples of + long `s’ shown in the preceeding item. \item[largesmallcaps:] prints larger \textlsc{Small Caps} than the default ones (\textsc{Petite Caps}). @@ -369,9 +374,8 @@ Here are the options available for Text Kp-fonts: \item[Style=Historic] replaces any instance of `s’ by the long variant {\addfontfeature{Style=Historic}s}. It is still possible to get a round - `s’ coding it as `|s=|’. As the long variant is never used at words’ ends - the feature \opt{calc} is also activated: it tries to catch end of words, - see \opt{veryoldstyle} p.~\pageref{veryoldstyle} for more details. + `s’ coding it as `|s=|’ specially at end of words; see options + \opt{veryoldstyle} and \opt{longs} p.~\pageref{longs} for more details. \item[Ligatures=Historic] switches specific ligatures for the long {\addfontfeature{Style=Historic}s}: diff --git a/Master/texmf-dist/doc/fonts/kpfonts-otf/Kpfonts-OTF-Doc-English.pdf b/Master/texmf-dist/doc/fonts/kpfonts-otf/Kpfonts-OTF-Doc-English.pdf Binary files differindex da945629e5b..a3a2bf61094 100644 --- a/Master/texmf-dist/doc/fonts/kpfonts-otf/Kpfonts-OTF-Doc-English.pdf +++ b/Master/texmf-dist/doc/fonts/kpfonts-otf/Kpfonts-OTF-Doc-English.pdf diff --git a/Master/texmf-dist/doc/fonts/kpfonts-otf/Kpfonts-OTF-Doc-French.ltx b/Master/texmf-dist/doc/fonts/kpfonts-otf/Kpfonts-OTF-Doc-French.ltx index 175f2b775db..d4bacc199b4 100644 --- a/Master/texmf-dist/doc/fonts/kpfonts-otf/Kpfonts-OTF-Doc-French.ltx +++ b/Master/texmf-dist/doc/fonts/kpfonts-otf/Kpfonts-OTF-Doc-French.ltx @@ -6,19 +6,13 @@ \usepackage[svgnames]{xcolor} \usepackage[hypcap=false]{caption} \usepackage{shortvrb} -\usepackage[veryoldstyle]{kpfonts-otf} % active la fonction "add_EoW" -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -% On annule l’effet de l’option "veryoldstyle" tout en gardant "add_EoW" -\defaultfontfeatures+[\ttfamily]{RawFeature={-hist;-calt;-swsh;-onum}} -\defaultfontfeatures+[KpRoman,KpLight,\sffamily]{% - RawFeature={-hist;-hlig;-calt;-swsh;-rlig;-onum},% +\usepackage{babel} +\frenchsetup{og=«, fg=»,%ListItemsAsPar } -% Recharger les fontes avec les nouvelles "features" : -\setmainfont{KpRoman} -\setsansfont{KpSans} -\setmonofont{KpMono}[Color=DarkBlue] -%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% -%Pour les démos : + +\usepackage[longs]{kpfonts-otf} + +% Pour les démos : \setmathfont{KpMath-Regular.otf}[version=full, CharacterVariant=3, StylisticSet={1,2,3,4,5,6,7}] @@ -27,10 +21,6 @@ \setmathfont{KpMath-Bold.otf}[version=bold, Style=leqslant, CharacterVariant=3] \setmathfont{KpMath-Sans.otf}[version=sans, Style=leqslant, CharacterVariant=3] -\usepackage{babel} -\frenchsetup{og=«, fg=»,%ListItemsAsPar -} - \usepackage{realscripts} \usepackage{microtype} \usepackage{hyperref} @@ -53,8 +43,8 @@ \title{Kp-fonts version OpenType} \author{\href{mailto:daniel.flipo@free.fr}{Daniel \textsc{Flipo}}} -\newcommand*{\version}{0.38} -\date{12 septembre 2021} +\newcommand*{\version}{0.39} +\date{28 septembre 2021} \begin{document} \maketitle @@ -247,7 +237,7 @@ Notez que ces options n'affectent que les polices de texte. suivi d’une espace (sécable ou non) produite par TeX% \footnote{On utilise la \emph{feature} OpenType \texttt{calt} qui ne reconnaît ni les \cmd{hskip} ni les \cmd{penalty} de TeX.} ! - Un contournement est fourni dans \file{kpfont-otf.sty} uniquement pour le + Le fichier \file{kpfont-otf.sty} fournit une parade au moins avec le moteur LuaTeX. Exemple : le codage |\textit{espoirs, mais quels~espoirs?}| produit comme il @@ -256,9 +246,15 @@ Notez que ces options n'affectent que les polices de texte. (avec fine insécable devant le `?’). Il est toujours possible de forcer un «s» rond en codant \texttt{s=}. - %Pour obtenir le même résultat avec XeTeX, il faudrait coder:\\ Avec XeTeX, il faudrait coder: |\textit{espoirs, mais= quels=~espoirs=?}|. +\item[longs :] \hlabel{longs} + empêche qu’un « s » suivi d’une espace sécable ou non soit + transformé en « s » long. Cette option, utilisable seulement avec + LuaTeX, est activée automatiquement par \opt{veryoldstyle} ; dans ce document + elle est utilisée seule pour traiter les exemples locaux de « s » long + (voir ci-dessus). + \item[largesmallcaps :] produit des petites capitales plus \textlsc{Grandes} que par les \textsc{Petites} obtenues par défaut. @@ -407,8 +403,9 @@ Pour les polices de texte de Kp-fonts les options suivantes sont proposées : \item[Style=Historic :] pour remplacer systématiquement le « s » rond par un {\addfontfeature{Style=Historic}« s »} long, il reste possible de forcer un « s » rond, en fin de mot notamment, en codant |s=| ; ce n’est pas toujours - nécessaire sous LuaTeX, voir l’option \opt{veryoldstyle} - p.~\pageref{veryoldstyle}. + nécessaire, sous LuaTeX activer l’option \opt{longs} de + \pkg{kpfonts-otf} |\usepackage[longs]{kpfonts-otf}| permet d’éviter ce + codage pour les « s » suivis d’une espace (voir p.~\pageref{veryoldstyle}). \item[Ligatures=Historic :] active les ligatures spécifiques au {\addfontfeature{Style=Historic,Ligatures=Historic}« s » long si, sl, st}. diff --git a/Master/texmf-dist/doc/fonts/kpfonts-otf/Kpfonts-OTF-Doc-French.pdf b/Master/texmf-dist/doc/fonts/kpfonts-otf/Kpfonts-OTF-Doc-French.pdf Binary files differindex 88966bd0366..a972d852cc0 100644 --- a/Master/texmf-dist/doc/fonts/kpfonts-otf/Kpfonts-OTF-Doc-French.pdf +++ b/Master/texmf-dist/doc/fonts/kpfonts-otf/Kpfonts-OTF-Doc-French.pdf diff --git a/Master/texmf-dist/doc/fonts/kpfonts-otf/README.md b/Master/texmf-dist/doc/fonts/kpfonts-otf/README.md index b936a57357b..479e8b1981c 100644 --- a/Master/texmf-dist/doc/fonts/kpfonts-otf/README.md +++ b/Master/texmf-dist/doc/fonts/kpfonts-otf/README.md @@ -152,6 +152,11 @@ Either version 1.3 or, at your option, any later version. - Added bold versions to \dotlessi, \dotlessj, named \mbfdotlessi, \mbfdotlessj (\mbfimath and \mbfjmath were already available). +* v. 0.39: + + New option "longs". Documentation corrected, thanks to Frank Mittelbach for + pointing out the glitch in v0.38. + --- Copyright 2020-2021 Daniel Flipo E-mail: daniel (dot) flipo (at) free (dot) fr diff --git a/Master/texmf-dist/doc/fonts/kpfonts-otf/unimath-kpfonts.pdf b/Master/texmf-dist/doc/fonts/kpfonts-otf/unimath-kpfonts.pdf Binary files differindex fce6666fdf1..dc98554244c 100644 --- a/Master/texmf-dist/doc/fonts/kpfonts-otf/unimath-kpfonts.pdf +++ b/Master/texmf-dist/doc/fonts/kpfonts-otf/unimath-kpfonts.pdf diff --git a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMath-Bold.otf b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMath-Bold.otf Binary files differindex 65ccbbcca2b..7ebfd35aa08 100644 --- a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMath-Bold.otf +++ b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMath-Bold.otf diff --git a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMath-Light.otf b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMath-Light.otf Binary files differindex f481fc329b3..eeb36588595 100644 --- a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMath-Light.otf +++ b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMath-Light.otf diff --git a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMath-Regular.otf b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMath-Regular.otf Binary files differindex 928570640c2..6e07e1a67a8 100644 --- a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMath-Regular.otf +++ b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMath-Regular.otf diff --git a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMath-Sans.otf b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMath-Sans.otf Binary files differindex dfe7ec9c266..3a8e4aeb028 100644 --- a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMath-Sans.otf +++ b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMath-Sans.otf diff --git a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMath-Semibold.otf b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMath-Semibold.otf Binary files differindex f3c36e3dda4..21bb0005b63 100644 --- a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMath-Semibold.otf +++ b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMath-Semibold.otf diff --git a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMono-Bold.otf b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMono-Bold.otf Binary files differindex e621eafc816..82d5893de5c 100644 --- a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMono-Bold.otf +++ b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMono-Bold.otf diff --git a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMono-BoldItalic.otf b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMono-BoldItalic.otf Binary files differindex b6fd35ccc49..e8fb57da359 100644 --- a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMono-BoldItalic.otf +++ b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMono-BoldItalic.otf diff --git a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMono-Italic.otf b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMono-Italic.otf Binary files differindex 3c0f2ee437e..b457067fbb4 100644 --- a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMono-Italic.otf +++ b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMono-Italic.otf diff --git a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMono-Regular.otf b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMono-Regular.otf Binary files differindex cbab0a41977..759033f4bd8 100644 --- a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMono-Regular.otf +++ b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpMono-Regular.otf diff --git a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-Bold.otf b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-Bold.otf Binary files differindex 35a26ab13e5..01462a82c48 100644 --- a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-Bold.otf +++ b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-Bold.otf diff --git a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-BoldItalic.otf b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-BoldItalic.otf Binary files differindex 2e763601cd3..5a8b45a39a0 100644 --- a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-BoldItalic.otf +++ b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-BoldItalic.otf diff --git a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-Italic.otf b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-Italic.otf Binary files differindex 954690297a7..424639821af 100644 --- a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-Italic.otf +++ b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-Italic.otf diff --git a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-Light.otf b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-Light.otf Binary files differindex 6537fe4ecd0..7b4a7ef7bf1 100644 --- a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-Light.otf +++ b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-Light.otf diff --git a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-LightItalic.otf b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-LightItalic.otf Binary files differindex 492a3d28d8e..464388a99f8 100644 --- a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-LightItalic.otf +++ b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-LightItalic.otf diff --git a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-Regular.otf b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-Regular.otf Binary files differindex 57136c6bc58..5a477033612 100644 --- a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-Regular.otf +++ b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-Regular.otf diff --git a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-Semibold.otf b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-Semibold.otf Binary files differindex 64fc5f0ff19..e266362c827 100644 --- a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-Semibold.otf +++ b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-Semibold.otf diff --git a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-SemiboldItalic.otf b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-SemiboldItalic.otf Binary files differindex 9895e5ad225..31953b5e926 100644 --- a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-SemiboldItalic.otf +++ b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpRoman-SemiboldItalic.otf diff --git a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpSans-Bold.otf b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpSans-Bold.otf Binary files differindex 9e932fc8bd4..cf84d5df458 100644 --- a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpSans-Bold.otf +++ b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpSans-Bold.otf diff --git a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpSans-BoldItalic.otf b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpSans-BoldItalic.otf Binary files differindex f8755f656c5..6e0517e266b 100644 --- a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpSans-BoldItalic.otf +++ b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpSans-BoldItalic.otf diff --git a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpSans-Italic.otf b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpSans-Italic.otf Binary files differindex 319022349d3..f1ec028877e 100644 --- a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpSans-Italic.otf +++ b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpSans-Italic.otf diff --git a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpSans-Regular.otf b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpSans-Regular.otf Binary files differindex ba5fc06118c..8a9a0ae4d19 100644 --- a/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpSans-Regular.otf +++ b/Master/texmf-dist/fonts/opentype/public/kpfonts-otf/KpSans-Regular.otf diff --git a/Master/texmf-dist/tex/latex/kpfonts-otf/kpfonts-otf.sty b/Master/texmf-dist/tex/latex/kpfonts-otf/kpfonts-otf.sty index 434ba2bd632..62520bc54d7 100644 --- a/Master/texmf-dist/tex/latex/kpfonts-otf/kpfonts-otf.sty +++ b/Master/texmf-dist/tex/latex/kpfonts-otf/kpfonts-otf.sty @@ -1,6 +1,6 @@ \NeedsTeXFormat{LaTeX2e}[2019-01-01] -\def\fileversion{0.38} -\def\filedate{2021-09-12} +\def\fileversion{0.39} +\def\filedate{2021-09-28} \ProvidesPackage{kpfonts-otf}[\filedate\space\fileversion] % Ensure luatex or xetex engine @@ -21,6 +21,7 @@ \newif\ifkp@osn \newif\ifkp@os \newif\ifkp@vos +\newif\ifkp@longs \newif\ifkp@Qtail % \newif\ifkp@lightmath @@ -49,7 +50,9 @@ \DeclareOption{lighttext} {\kp@lighttexttrue} \DeclareOption{oldstylenums} {\kp@osntrue} \DeclareOption{oldstyle} {\kp@ostrue\kp@osntrue\kp@Qtailtrue} -\DeclareOption{veryoldstyle} {\kp@vostrue\kp@osntrue\kp@Qtailtrue} +\DeclareOption{longs} {\kp@longstrue} +\DeclareOption{veryoldstyle} {\kp@vostrue\kp@osntrue\kp@Qtailtrue + \ifluatex\kp@longstrue\fi} \DeclareOption{largesmallcaps} {\kp@largesmallcapstrue} \DeclareOption{altfligs} {\kp@altfligstrue} \DeclareOption{germandbls} {\kp@germandblstrue} @@ -115,6 +118,9 @@ \fi \defaultfontfeatures+[KpRoman,KpLight,\sffamily]{% Style=Historic,Ligatures=Historic,Contextuals=Alternate} + \fi + %% No Long s before spaces with luatex + \ifkp@longs \ifluatex % This function adds character U+200B (zero width space) when an "s" % is followed by a TeX space (glue or penalty) so that it is not turned @@ -162,7 +168,9 @@ "add_end_of_word_boundary"); } } - \fi + \else + \PackageWarning{kpfonts-otf}% + {Option "longs" skipped (luatex only), reported} \fi % Smallcaps \ifkp@largesmallcaps |