diff options
author | Norbert Preining <norbert@preining.info> | 2020-11-09 03:01:20 +0000 |
---|---|---|
committer | Norbert Preining <norbert@preining.info> | 2020-11-09 03:01:20 +0000 |
commit | 789b6713c1344b831e5e000bf7fb98700caa5e14 (patch) | |
tree | 01d0e5e3e367abfd26a0b912a52ba1eb56847876 /fonts/baskervaldx/tex/Baskervaldx.sty | |
parent | 3021c3d95971e522d22cf5c8aba3410a06d8a84f (diff) |
CTAN sync 202011090301
Diffstat (limited to 'fonts/baskervaldx/tex/Baskervaldx.sty')
-rw-r--r-- | fonts/baskervaldx/tex/Baskervaldx.sty | 35 |
1 files changed, 23 insertions, 12 deletions
diff --git a/fonts/baskervaldx/tex/Baskervaldx.sty b/fonts/baskervaldx/tex/Baskervaldx.sty index be237ea679..dc7babddc7 100644 --- a/fonts/baskervaldx/tex/Baskervaldx.sty +++ b/fonts/baskervaldx/tex/Baskervaldx.sty @@ -1,8 +1,8 @@ %% Baskervaldx.sty %% \NeedsTeXFormat{LaTeX2e} -\def\fileversion{1.073} -\def\filedate{2020/01/31} +\def\fileversion{1.075} +\def\filedate{2020/11/07} \ProvidesPackage{Baskervaldx} [\filedate\space v\fileversion] @@ -12,13 +12,13 @@ \RequirePackage{textcomp} \IfFileExists{mweights.sty}{\RequirePackage{mweights}}{} \RequirePackage{etoolbox} +\RequirePackage{scalefnt} \IfFileExists{fontaxes.sty}{ \RequirePackage{fontaxes} -% changed the following due to changes in pdflatex 2020-02-02 -% \DeclareRobustCommand\swshape{\not@math@alphabet\swshape\relax -% \fontprimaryshape\itdefault\fontsecondaryshape\swdefault\selectfont} -% \fa@naming@exception{shape}{{n}{sw}}{nw} -% \fa@naming@exception{shape}{{it}{sw}}{sw} + \DeclareRobustCommand\swshape{\not@math@alphabet\swshape\relax + \fontprimaryshape\itdefault\fontsecondaryshape\swdefault\selectfont} + \fa@naming@exception{shape}{{n}{sw}}{nw} + \fa@naming@exception{shape}{{it}{sw}}{sw} \fa@naming@exception{figures}{{superior}{proportional}}{Sup} \fa@naming@exception{figures}{{superior}{tabular}}{Sup} \def\sufigures{\@nomath\sufigures @@ -60,14 +60,23 @@ \ExecuteOptionsX{lining,tabular} \ProcessOptionsX\relax - -\DeclareTextCommand{\textcircled}{TS1}[1]{\hmode@bgroup +% Over-ride the latex definition of \textcircled +\def\textcircled#1{\hmode@bgroup \ooalign{% - \hfil \raise .42ex\hbox {\fontencoding{T1}\fontseries{m}\fontshape{sc}\fontsize{8.7}{10}\selectfont \lowercase{#1}}\hfil \crcr - \textbigcircle % textbigcircle + \hfil \raise .38ex\hbox {\usefont{T1}{Baskervaldx-TLF}{m}{sc} + \ifnum\number`#1>64 \scalefont{.73}\else\scalefont{.54}\fi% + \lowercase{#1}}\hfil \crcr + \hfil\usefont{TS1}{Baskervaldx-TLF}{m}{n}\char79 \hfil% bigcircle }% \egroup} +%\DeclareTextCommand{\textcircled}{TS1}[1]{\hmode@bgroup +% \ooalign{% +% \hfil \raise .42ex\hbox {\fontencoding{T1}\fontseries{m}\fontshape{sc}\fontsize{8.7}{10}\selectfont \lowercase{#1}}\hfil \crcr +% \textbigcircle % textbigcircle +% }% +% \egroup} + \DeclareRobustCommand{\lfstyle}{% \not@math@alphabet\lfstyle\relax \fontfamily{Baskervaldx-LF}\selectfont % @@ -117,6 +126,8 @@ \fi% \fi + + %\ifBaskervaldx@babel % \renewcommand*{\swdefault}{sw} % \renewcommand*{\rmdefault}% @@ -124,7 +135,7 @@ % \normalfont %\else \AtEndPreamble{% - %\renewcommand*{\swdefault}{sw} + \renewcommand*{\swdefault}{sw} \renewcommand*{\rmdefault}% {Baskervaldx-\Baskervaldx@figurealign\Baskervaldx@figurestyle} \normalfont} |